[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/bytecomp.el [lexbind]

[Miles Bader]

Index: emacs/lisp/emacs-lisp/bytecomp.el
diff -c emacs/lisp/emacs-lisp/bytecomp.el:2.98.2.28 
emacs/lisp/emacs-lisp/bytecomp.el:2.98.2.29
*** emacs/lisp/emacs-lisp/bytecomp.el:2.98.2.28 Fri Nov 12 04:21:19 2004
--- emacs/lisp/emacs-lisp/bytecomp.el   Wed Dec  8 23:36:31 2004
***************
*** 994,1007 ****
    (when byte-compile-read-position
      (let (last entry)
        (while (progn
!            (setq last byte-compile-last-position
!              entry (assq sym read-symbol-positions-list))
!            (when entry
!            (setq byte-compile-last-position
!              (+ byte-compile-read-position (cdr entry))
!              read-symbol-positions-list
!              (byte-compile-delete-first
!               entry read-symbol-positions-list)))
               (or (and allow-previous (not (= last 
byte-compile-last-position)))
                   (> last byte-compile-last-position)))))))
  
--- 994,1007 ----
    (when byte-compile-read-position
      (let (last entry)
        (while (progn
!              (setq last byte-compile-last-position
!                    entry (assq sym read-symbol-positions-list))
!              (when entry
!                (setq byte-compile-last-position
!                      (+ byte-compile-read-position (cdr entry))
!                      read-symbol-positions-list
!                      (byte-compile-delete-first
!                       entry read-symbol-positions-list)))
               (or (and allow-previous (not (= last 
byte-compile-last-position)))
                   (> last byte-compile-last-position)))))))
  
***************
*** 2875,2892 ****
  ;;
  (defun byte-compile-form (form &optional for-effect)
    (cond ((not (consp form))
-        (when (symbolp form)
-          (byte-compile-set-symbol-position form))
         (cond ((or (not (symbolp form)) (byte-compile-const-symbol-p form))
                (byte-compile-constant form))
               ((and for-effect byte-compile-delete-errors)
                (setq for-effect nil))
               (t
                (byte-compile-variable-ref form))))
        ((symbolp (car form))
         (let* ((fn (car form))
                (handler (get fn 'byte-compile)))
-          (byte-compile-set-symbol-position fn)
           (when (byte-compile-const-symbol-p fn)
             (byte-compile-warn "`%s' called as a function" fn))
           (and (memq 'interactive-only byte-compile-warnings)
--- 2875,2893 ----
  ;;
  (defun byte-compile-form (form &optional for-effect)
    (cond ((not (consp form))
         (cond ((or (not (symbolp form)) (byte-compile-const-symbol-p form))
+               (when (symbolp form)
+                 (byte-compile-set-symbol-position form))
                (byte-compile-constant form))
               ((and for-effect byte-compile-delete-errors)
+               (when (symbolp form)
+                 (byte-compile-set-symbol-position form))
                (setq for-effect nil))
               (t
                (byte-compile-variable-ref form))))
        ((symbolp (car form))
         (let* ((fn (car form))
                (handler (get fn 'byte-compile)))
           (when (byte-compile-const-symbol-p fn)
             (byte-compile-warn "`%s' called as a function" fn))
           (and (memq 'interactive-only byte-compile-warnings)
***************
*** 2897,2903 ****
                    (or (not (byte-compile-version-cond
                              byte-compile-compatibility))
                        (not (get (get fn 'byte-opcode) 'emacs19-opcode))))
!              (funcall handler form)
             (if (memq 'callargs byte-compile-warnings)
                 (byte-compile-callargs-warn form))
             (byte-compile-normal-call form))
--- 2898,2906 ----
                    (or (not (byte-compile-version-cond
                              byte-compile-compatibility))
                        (not (get (get fn 'byte-opcode) 'emacs19-opcode))))
!              (progn
!                (byte-compile-set-symbol-position fn)
!                (funcall handler form))
             (if (memq 'callargs byte-compile-warnings)
                 (byte-compile-callargs-warn form))
             (byte-compile-normal-call form))