[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/bytecomp.el
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/bytecomp.el |
Date: |
Sat, 20 Nov 2004 20:20:57 -0500 |
Index: emacs/lisp/emacs-lisp/bytecomp.el
diff -c emacs/lisp/emacs-lisp/bytecomp.el:2.158
emacs/lisp/emacs-lisp/bytecomp.el:2.159
*** emacs/lisp/emacs-lisp/bytecomp.el:2.158 Thu Nov 11 22:44:45 2004
--- emacs/lisp/emacs-lisp/bytecomp.el Sun Nov 21 00:47:13 2004
***************
*** 914,927 ****
(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)))))))
--- 914,927 ----
(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)))))))
***************
*** 2714,2730 ****
(defun byte-compile-form (form &optional for-effect)
(setq form (macroexpand form byte-compile-macro-environment))
(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 'byte-varref 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)
--- 2714,2731 ----
(defun byte-compile-form (form &optional for-effect)
(setq form (macroexpand form byte-compile-macro-environment))
(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 'byte-varref 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)
***************
*** 2735,2741 ****
(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))
--- 2736,2744 ----
(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))