From 2c0696b144c468d8ec3eb5eba8a24f176a9d417e Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 19 Sep 2003 14:29:42 +0000 Subject: (byte-compile-warning-prefix): Fix the condition for whether to print "In WHERE". --- lisp/emacs-lisp/bytecomp.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 077c68523c2..743ebea3c1e 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -10,7 +10,7 @@ ;;; This version incorporates changes up to version 2.10 of the ;;; Zawinski-Furuseth compiler. -(defconst byte-compile-version "$Revision: 2.136 $") +(defconst byte-compile-version "$Revision: 2.137 $") ;; This file is part of GNU Emacs. @@ -929,7 +929,7 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property." (when (or (and byte-compile-current-file (not (equal byte-compile-current-file byte-compile-last-logged-file))) - (and byte-compile-last-warned-form + (and byte-compile-current-form (not (eq byte-compile-current-form byte-compile-last-warned-form)))) (insert (format "\nIn %s:\n" form))) -- cgit v1.2.3 From 9dbd7d667468d1c162ded576e2eb19b9cb3e91da Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 22 Sep 2003 15:16:10 +0000 Subject: (byte-compile-log-file): Clear out byte-compile-last-warned-form. --- lisp/emacs-lisp/bytecomp.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 743ebea3c1e..5b3a846cd2f 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -10,7 +10,7 @@ ;;; This version incorporates changes up to version 2.10 of the ;;; Zawinski-Furuseth compiler. -(defconst byte-compile-version "$Revision: 2.137 $") +(defconst byte-compile-version "$Revision: 2.138 $") ;; This file is part of GNU Emacs. @@ -975,7 +975,8 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property." (setq default-directory dir) (unless was-same (insert (format "Entering directory `%s'\n" default-directory)))) - (setq byte-compile-last-logged-file byte-compile-current-file) + (setq byte-compile-last-logged-file byte-compile-current-file + byte-compile-last-warned-form nil) ;; Do this after setting default-directory. (unless (eq major-mode 'compilation-mode) (compilation-mode)) -- cgit v1.2.3 From 7618fe8e02aed9e6f1bb5d7ba30e272c3adf662b Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Mon, 12 Jan 2004 23:28:29 +0000 Subject: (compile-defun): Doc fix. --- lisp/emacs-lisp/bytecomp.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 5b3a846cd2f..f6444d42b35 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -10,7 +10,7 @@ ;;; This version incorporates changes up to version 2.10 of the ;;; Zawinski-Furuseth compiler. -(defconst byte-compile-version "$Revision: 2.138 $") +(defconst byte-compile-version "$Revision: 2.139 $") ;; This file is part of GNU Emacs. @@ -75,7 +75,7 @@ ;; User customization variables: ;; ;; byte-compile-verbose Whether to report the function currently being -;; compiled in the minibuffer; +;; compiled in the echo area; ;; byte-optimize Whether to do optimizations; this may be ;; t, nil, 'source, or 'byte; ;; byte-optimize-log Whether to report (in excruciating detail) @@ -1658,7 +1658,7 @@ The value is non-nil if there were no errors, nil if errors." ;;;###autoload (defun compile-defun (&optional arg) "Compile and evaluate the current top-level form. -Print the result in the minibuffer. +Print the result in the echo area. With argument, insert value in current buffer after the form." (interactive "P") (save-excursion -- cgit v1.2.3 From 9a7268cf3ac492d8118c02e42af6977b32459fbf Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Tue, 13 Jan 2004 00:24:12 +0000 Subject: *** empty log message *** --- lisp/emacs-lisp/bytecomp.el | 4 ++-- lispref/files.texi | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index f6444d42b35..d4949f94aa6 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -10,7 +10,7 @@ ;;; This version incorporates changes up to version 2.10 of the ;;; Zawinski-Furuseth compiler. -(defconst byte-compile-version "$Revision: 2.139 $") +(defconst byte-compile-version "$Revision: 2.140 $") ;; This file is part of GNU Emacs. @@ -130,7 +130,7 @@ ;; (baz 0)) ;; ;; o It is possible to open-code a function in the same file it is defined -;; in without having to load that file before compiling it. the +;; in without having to load that file before compiling it. The ;; byte-compiler has been modified to remember function definitions in ;; the compilation environment in the same way that it remembers macro ;; definitions. diff --git a/lispref/files.texi b/lispref/files.texi index c1ed45b5dff..04c27971445 100644 --- a/lispref/files.texi +++ b/lispref/files.texi @@ -416,9 +416,9 @@ calling @code{set-visited-file-name} does not. @defopt before-save-hook This normal hook runs before a buffer is saved in its visited file, regardless of whether that is done normally or by one of the hooks -described above. One use of this hook is for the Copyright package; -it uses this hook to make sure the file has the current year in the -copyright header. +described above. For instance, the @file{copyright.el} program uses +this hook to make sure the file you are saving has the current year in +its copyright notice. @end defopt @c Emacs 19 feature -- cgit v1.2.3 From ab43c85050514d20dff26eeec448a8970d3a0f53 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 29 Jan 2004 17:58:16 +0000 Subject: (byte-compile-compatibility): Doc fix. (byte-compile-format-warn): New. (byte-compile-callargs-warn): Use it. (Format, message, error): Add byte-compile-format-like property. (byte-compile-maybe-guarded): New. (byte-compile-if, byte-compile-cond): Use it. (byte-compile-lambda): Compile interactive forms, just to make warnings about them. --- lisp/ChangeLog | 28 +++++++++ lisp/emacs-lisp/bytecomp.el | 148 ++++++++++++++++++++++++++++---------------- 2 files changed, 123 insertions(+), 53 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e12a9b4ee9c..c3e98e8cd11 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,31 @@ +2004-01-29 Tue Jari Aalto poboxes.com> + + * progmodes/executable.el (executable-command-find-posix-p): + New. Check if find handles arguments Posix-style. + + * progmodes/grep.el (grep-compute-defaults): + Use executable-command-find-posix-p. + (grep-find): Check `grep-find-command'. + + * filecache.el (file-cache-find-posix-p): Deleted. + (file-cache-add-directory-using-find): + Use `executable-command-find-posix-p' + +2004-01-29 Dave Love + + * emacs-lisp/lisp.el (beginning-of-defun-raw, end-of-defun): + Iterate the hook function if arg is given. + (mark-defun, narrow-to-defun): Change order of finding the limits. + + * emacs-lisp/bytecomp.el (byte-compile-compatibility): Doc fix. + (byte-compile-format-warn): New. + (byte-compile-callargs-warn): Use it. + (Format, message, error): Add byte-compile-format-like property. + (byte-compile-maybe-guarded): New. + (byte-compile-if, byte-compile-cond): Use it. + (byte-compile-lambda): Compile interactive forms, + just to make warnings about them. + 2004-01-29 Jonathan Yavner * ses.el (ses-initial-column-width): Increase to 14, so it will diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index d4949f94aa6..a1ce848d9d7 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -10,7 +10,7 @@ ;;; This version incorporates changes up to version 2.10 of the ;;; Zawinski-Furuseth compiler. -(defconst byte-compile-version "$Revision: 2.140 $") +(defconst byte-compile-version "$Revision: 2.141 $") ;; This file is part of GNU Emacs. @@ -251,7 +251,9 @@ if you change this variable." :type 'boolean) (defcustom byte-compile-compatibility nil - "*Non-nil means generate output that can run in Emacs 18." + "*Non-nil means generate output that can run in Emacs 18. +This only means that it can run in principle, if it doesn't require +facilities that have been added more recently." :group 'bytecomp :type 'boolean) @@ -444,6 +446,11 @@ Each element looks like (FUNCTIONNAME . DEFINITION). It is Used for warnings when the function is not known to be defined or is later defined with incorrect args.") +(defvar byte-compile-noruntime-functions nil + "Alist of functions called that may not be defined when the compiled code is run. +Used for warnings about calling a function that is defined during compilation +but won't necessarily be defined when the compiled file is loaded.") + (defvar byte-compile-tag-number 0) (defvar byte-compile-output nil "Alist describing contents to put in byte code string. @@ -776,7 +783,7 @@ otherwise pop it") (defun byte-compile-eval (form) "Eval FORM and mark the functions defined therein. -Each function's symbol gets marked with the `byte-compile-noruntime' property." +Each function's symbol gets added to `byte-compile-noruntime-functions'." (let ((hist-orig load-history) (hist-nil-orig current-load-list)) (prog1 (eval form) @@ -794,17 +801,17 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property." (cond ((symbolp s) (unless (memq s old-autoloads) - (put s 'byte-compile-noruntime t))) + (push s byte-compile-noruntime-functions))) ((and (consp s) (eq t (car s))) (push (cdr s) old-autoloads)) ((and (consp s) (eq 'autoload (car s))) - (put (cdr s) 'byte-compile-noruntime t))))))) + (push (cdr s) byte-compile-noruntime-functions))))))) ;; Go through current-load-list for the locally defined funs. (let (old-autoloads) (while (and hist-nil-new (not (eq hist-nil-new hist-nil-orig))) (let ((s (pop hist-nil-new))) (when (and (symbolp s) (not (memq s old-autoloads))) - (put s 'byte-compile-noruntime t)) + (push s byte-compile-noruntime-functions)) (when (and (consp s) (eq t (car s))) (push (cdr s) old-autoloads)))))))))) @@ -1170,10 +1177,11 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property." "requires" "accepts only") (byte-compile-arglist-signature-string sig)))) + (byte-compile-format-warn form) ;; Check to see if the function will be available at runtime ;; and/or remember its arity if it's unknown. (or (and (or sig (fboundp (car form))) ; might be a subr or autoload. - (not (get (car form) 'byte-compile-noruntime))) + (not (memq (car form) byte-compile-noruntime-functions))) (eq (car form) byte-compile-current-form) ; ## this doesn't work ; with recursion. ;; It's a currently-undefined function. @@ -1187,6 +1195,32 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property." (cons (list (car form) n) byte-compile-unresolved-functions))))))) +(defun byte-compile-format-warn (form) + "Warn if FORM is `format'-like with inconsistent args. +Applies if head of FORM is a symbol with non-nil property +`byte-compile-format-like' and first arg is a constant string. +Then check the number of format fields matches the number of +extra args." + (when (and (symbolp (car form)) + (stringp (nth 1 form)) + (get (car form) 'byte-compile-format-like)) + (let ((nfields (with-temp-buffer + (insert (nth 1 form)) + (goto-char 1) + (let ((n 0)) + (while (re-search-forward "%." nil t) + (unless (eq ?% (char-after (1+ (match-beginning 0)))) + (setq n (1+ n)))) + n))) + (nargs (- (length form) 2))) + (unless (= nargs nfields) + (byte-compile-warn + "`%s' called with %d args to fill %d format field(s)" (car form) + nargs nfields))))) + +(dolist (elt '(format message error)) + (put elt 'byte-compile-format-like t)) + ;; Warn if the function or macro is being redefined with a different ;; number of arguments. (defun byte-compile-arglist-warn (form macrop) @@ -1254,7 +1288,7 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property." (let ((func (car-safe form))) (if (and byte-compile-cl-functions (memq func byte-compile-cl-functions) - ;; Aliases which won't have been expended at this point. + ;; Aliases which won't have been expanded at this point. ;; These aren't all aliases of subrs, so not trivial to ;; avoid hardwiring the list. (not (memq func @@ -2453,17 +2487,19 @@ If FORM is a lambda or a macro, byte-compile it as a function." (if (cdr (cdr int)) (byte-compile-warn "malformed interactive spec: %s" (prin1-to-string int))) - ;; If the interactive spec is a call to `list', - ;; don't compile it, because `call-interactively' - ;; looks at the args of `list'. + ;; If the interactive spec is a call to `list', don't + ;; compile it, because `call-interactively' looks at the + ;; args of `list'. Actually, compile it to get warnings, + ;; but don't use the result. (let ((form (nth 1 int))) (while (memq (car-safe form) '(let let* progn save-excursion)) (while (consp (cdr form)) (setq form (cdr form))) (setq form (car form))) - (or (eq (car-safe form) 'list) - (setq int (list 'interactive - (byte-compile-top-level (nth 1 int))))))) + (if (eq (car-safe form) 'list) + (byte-compile-top-level (nth 1 int)) + (setq int (list 'interactive + (byte-compile-top-level (nth 1 int))))))) ((cdr int) (byte-compile-warn "malformed interactive spec: %s" (prin1-to-string int))))) @@ -3265,51 +3301,55 @@ If FORM is a lambda or a macro, byte-compile it as a function." (if ,discard 'byte-goto-if-nil 'byte-goto-if-nil-else-pop)) ,tag)) +(defmacro byte-compile-maybe-guarded (condition &rest body) + "Execute forms in BODY, potentially guarded by CONDITION. +CONDITION is the test in an `if' form or in a `cond' clause. +BODY is to compile the first arm of the if or the body of the +cond clause. If CONDITION is of the form `(foundp 'foo)' +or `(boundp 'foo)', the relevant warnings from BODY about foo +being undefined will be suppressed." + (declare (indent 1) (debug t)) + `(let* ((fbound + (if (eq 'fboundp (car-safe ,condition)) + (and (eq 'quote (car-safe (nth 1 ,condition))) + ;; Ignore if the symbol is already on the + ;; unresolved list. + (not (assq (nth 1 (nth 1 ,condition)) ; the relevant symbol + byte-compile-unresolved-functions)) + (nth 1 (nth 1 ,condition))))) + (bound (if (or (eq 'boundp (car-safe ,condition)) + (eq 'default-boundp (car-safe ,condition))) + (and (eq 'quote (car-safe (nth 1 ,condition))) + (nth 1 (nth 1 ,condition))))) + ;; Maybe add to the bound list. + (byte-compile-bound-variables + (if bound + (cons bound byte-compile-bound-variables) + byte-compile-bound-variables))) + (progn ,@body) + ;; Maybe remove the function symbol from the unresolved list. + (if fbound + (setq byte-compile-unresolved-functions + (delq (assq fbound byte-compile-unresolved-functions) + byte-compile-unresolved-functions))))) + (defun byte-compile-if (form) (byte-compile-form (car (cdr form))) ;; Check whether we have `(if (fboundp ...' or `(if (boundp ...' ;; and avoid warnings about the relevent symbols in the consequent. - (let* ((clause (nth 1 form)) - (fbound (if (eq 'fboundp (car-safe clause)) - (and (eq 'quote (car-safe (nth 1 clause))) - ;; Ignore if the symbol is already on the - ;; unresolved list. - (not (assq - (nth 1 (nth 1 clause)) ; the relevant symbol - byte-compile-unresolved-functions)) - (nth 1 (nth 1 clause))))) - (bound (if (eq 'boundp (car-safe clause)) - (and (eq 'quote (car-safe (nth 1 clause))) - (nth 1 (nth 1 clause))))) - (donetag (byte-compile-make-tag))) + (let ((clause (nth 1 form)) + (donetag (byte-compile-make-tag))) (if (null (nthcdr 3 form)) ;; No else-forms (progn (byte-compile-goto-if nil for-effect donetag) - ;; Maybe add to the bound list. - (let ((byte-compile-bound-variables - (if bound - (cons bound byte-compile-bound-variables) - byte-compile-bound-variables))) + (byte-compile-maybe-guarded clause (byte-compile-form (nth 2 form) for-effect)) - ;; Maybe remove the function symbol from the unresolved list. - (if fbound - (setq byte-compile-unresolved-functions - (delq (assq fbound byte-compile-unresolved-functions) - byte-compile-unresolved-functions))) (byte-compile-out-tag donetag)) (let ((elsetag (byte-compile-make-tag))) (byte-compile-goto 'byte-goto-if-nil elsetag) - ;; As above for the first form. - (let ((byte-compile-bound-variables - (if bound - (cons bound byte-compile-bound-variables) - byte-compile-bound-variables))) - (byte-compile-form (nth 2 form) for-effect)) - (if fbound - (setq byte-compile-unresolved-functions - (delq (assq fbound byte-compile-unresolved-functions) - byte-compile-unresolved-functions))) + (byte-compile-maybe-guarded clause + (byte-compile-form (nth 2 form) for-effect)) (byte-compile-goto 'byte-goto donetag) (byte-compile-out-tag elsetag) (byte-compile-body (cdr (cdr (cdr form))) for-effect) @@ -3332,14 +3372,16 @@ If FORM is a lambda or a macro, byte-compile it as a function." (if (null (cdr clause)) ;; First clause is a singleton. (byte-compile-goto-if t for-effect donetag) - (setq nexttag (byte-compile-make-tag)) - (byte-compile-goto 'byte-goto-if-nil nexttag) - (byte-compile-body (cdr clause) for-effect) - (byte-compile-goto 'byte-goto donetag) - (byte-compile-out-tag nexttag))))) + (setq nexttag (byte-compile-make-tag)) + (byte-compile-goto 'byte-goto-if-nil nexttag) + (byte-compile-maybe-guarded (car clause) + (byte-compile-body (cdr clause) for-effect)) + (byte-compile-goto 'byte-goto donetag) + (byte-compile-out-tag nexttag))))) ;; Last clause (and (cdr clause) (not (eq (car clause) t)) - (progn (byte-compile-form (car clause)) + (progn (byte-compile-maybe-guarded (car clause) + (byte-compile-form (car clause))) (byte-compile-goto-if nil for-effect donetag) (setq clause (cdr clause)))) (byte-compile-body-do-effect clause) -- cgit v1.2.3 From 8de4476933f4805e010512ba4dabb39426c4c3bd Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 12 Mar 2004 10:09:59 +0000 Subject: (byte-compile-get-constant): For strings, do compare text properties. --- lisp/emacs-lisp/bytecomp.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index a1ce848d9d7..f4bcb353518 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -10,7 +10,7 @@ ;;; This version incorporates changes up to version 2.10 of the ;;; Zawinski-Furuseth compiler. -(defconst byte-compile-version "$Revision: 2.141 $") +(defconst byte-compile-version "$Revision: 2.142 $") ;; This file is part of GNU Emacs. @@ -2776,7 +2776,8 @@ If FORM is a lambda or a macro, byte-compile it as a function." (defmacro byte-compile-get-constant (const) `(or (if (stringp ,const) - (assoc ,const byte-compile-constants) + (assoc-default ,const byte-compile-constants + 'equal-including-properties nil) (assq ,const byte-compile-constants)) (car (setq byte-compile-constants (cons (list ,const) byte-compile-constants))))) -- cgit v1.2.3 From b122f3fb5ac825f2a429442b2485cd77bb0ecf94 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 22 Mar 2004 15:23:59 +0000 Subject: (byte-recompile-directory): Ignore hidden dir. (byte-compile-file): Output warning when deleting a file. --- lisp/emacs-lisp/bytecomp.el | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index f4bcb353518..e2a228c0d79 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1,6 +1,6 @@ ;;; bytecomp.el --- compilation of Lisp code into byte code -;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002, 2003 +;; Copyright (C) 1985,86,87,92,94,1998,2000,01,02,03,2004 ;; Free Software Foundation, Inc. ;; Author: Jamie Zawinski @@ -10,7 +10,7 @@ ;;; This version incorporates changes up to version 2.10 of the ;;; Zawinski-Furuseth compiler. -(defconst byte-compile-version "$Revision: 2.142 $") +(defconst byte-compile-version "$Revision: 2.143 $") ;; This file is part of GNU Emacs. @@ -1493,7 +1493,8 @@ recompile every `.el' file that already has a `.elc' file." source dest) (dolist (file files) (setq source (expand-file-name file directory)) - (if (and (not (member file '("." ".." "RCS" "CVS"))) + (if (and (not (member file '("RCS" "CVS"))) + (not (eq ?\. (aref file 0))) (file-directory-p source) (not (file-symlink-p source))) ;; This file is a subdirectory. Handle them differently. @@ -1611,11 +1612,14 @@ The value is non-nil if there were no errors, nil if errors." ;; compile this file. (if (with-current-buffer input-buffer no-byte-compile) (progn - (message "%s not compiled because of `no-byte-compile: %s'" - (file-relative-name filename) - (with-current-buffer input-buffer no-byte-compile)) - (if (file-exists-p target-file) - (condition-case nil (delete-file target-file) (error nil))) + ;; (message "%s not compiled because of `no-byte-compile: %s'" + ;; (file-relative-name filename) + ;; (with-current-buffer input-buffer no-byte-compile)) + (when (file-exists-p target-file) + (message "%s deleted because of `no-byte-compile: %s'" + (file-relative-name target-file) + (buffer-local-value 'no-byte-compile input-buffer)) + (condition-case nil (delete-file target-file) (error nil))) ;; We successfully didn't compile this file. 'no-byte-compile) (when byte-compile-verbose -- cgit v1.2.3 From 1f3ddf11e81c4c707fe2f231d05012185b842403 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sat, 10 Apr 2004 05:55:49 +0000 Subject: Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-196 Remove RCS keywords 2004-04-10 Miles Bader RCS keyword removal (only non-comment changes are enumerated here): * lisp/emacs-lisp/bytecomp.el (byte-compile-version): Variable removed. (byte-compile-insert-header): Don't use `byte-compile-version'. * lisp/url/url-vars.el (url-version): Use the constant string "Emacs" instead of calculating something from the RCS `State' keyword [the latter is almost entirely useless anyway]. * lisp/forms.el (forms-version): Variable removed. (forms-mode): Don't use `forms-version'. * lisp/recentf.el (recentf-version): Variable removed. * lisp/progmodes/delphi.el (delphi-version): Variable removed. * lisp/progmodes/ada-mode.el (ada-mode): RCS keyword removed from docstring. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/allout.el | 3 +-- lisp/calendar/todo-mode.el | 7 ------- lisp/emacs-lisp/bytecomp.el | 9 +-------- lisp/emacs-lisp/cl-specs.el | 1 - lisp/emacs-lisp/eldoc.el | 2 -- lisp/forms.el | 7 +------ lisp/ldefs-boot.el | 1 - lisp/mail/metamail.el | 1 - lisp/net/rlogin.el | 2 -- lisp/obsolete/rsz-mini.el | 2 -- lisp/progmodes/ada-mode.el | 1 - lisp/progmodes/ada-prj.el | 1 - lisp/progmodes/ada-stmt.el | 2 -- lisp/progmodes/autoconf.el | 1 - lisp/progmodes/delphi.el | 6 ------ lisp/progmodes/idlw-shell.el | 1 - lisp/progmodes/idlw-toolbar.el | 1 - lisp/progmodes/idlwave.el | 1 - lisp/progmodes/tcl.el | 1 - lisp/progmodes/vhdl-mode.el | 1 - lisp/recentf.el | 2 -- lisp/type-break.el | 2 -- lisp/url/url-about.el | 3 --- lisp/url/url-auth.el | 3 --- lisp/url/url-cache.el | 3 --- lisp/url/url-cid.el | 3 --- lisp/url/url-cookie.el | 3 --- lisp/url/url-dav.el | 1 - lisp/url/url-dired.el | 3 --- lisp/url/url-expand.el | 3 --- lisp/url/url-file.el | 3 --- lisp/url/url-ftp.el | 3 --- lisp/url/url-gw.el | 2 -- lisp/url/url-handlers.el | 3 --- lisp/url/url-history.el | 3 --- lisp/url/url-http.el | 1 - lisp/url/url-https.el | 3 --- lisp/url/url-imap.el | 2 -- lisp/url/url-irc.el | 3 --- lisp/url/url-ldap.el | 3 --- lisp/url/url-mailto.el | 3 --- lisp/url/url-methods.el | 3 --- lisp/url/url-misc.el | 3 --- lisp/url/url-news.el | 3 --- lisp/url/url-nfs.el | 3 --- lisp/url/url-ns.el | 3 --- lisp/url/url-parse.el | 3 --- lisp/url/url-privacy.el | 3 --- lisp/url/url-proxy.el | 3 --- lisp/url/url-util.el | 2 -- lisp/url/url-vars.el | 8 +------- lisp/url/url.el | 1 - lisp/url/vc-dav.el | 1 - lisp/whitespace.el | 1 - oldXMenu/Activate.c | 1 - oldXMenu/AddPane.c | 1 - oldXMenu/AddSel.c | 1 - oldXMenu/ChgPane.c | 1 - oldXMenu/ChgSel.c | 1 - oldXMenu/Create.c | 1 - oldXMenu/DelPane.c | 1 - oldXMenu/DelSel.c | 1 - oldXMenu/Destroy.c | 1 - oldXMenu/Error.c | 1 - oldXMenu/EvHand.c | 1 - oldXMenu/FindPane.c | 1 - oldXMenu/FindSel.c | 1 - oldXMenu/InsPane.c | 1 - oldXMenu/InsSel.c | 1 - oldXMenu/Internal.c | 1 - oldXMenu/Locate.c | 1 - oldXMenu/Post.c | 1 - oldXMenu/Recomp.c | 1 - oldXMenu/SetAEQ.c | 1 - oldXMenu/SetFrz.c | 1 - oldXMenu/SetPane.c | 1 - oldXMenu/SetSel.c | 1 - oldXMenu/X10.h | 1 - oldXMenu/XCrAssoc.c | 1 - oldXMenu/XDelAssoc.c | 1 - oldXMenu/XDestAssoc.c | 1 - oldXMenu/XLookAssoc.c | 1 - oldXMenu/XMakeAssoc.c | 1 - oldXMenu/XMenu.h | 1 - oldXMenu/XMenuInt.h | 1 - oldXMenu/copyright.h | 1 - 87 files changed, 19 insertions(+), 171 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1bf1fe7d51c..ba1c748ab51 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2004-04-10 Miles Bader + + RCS keyword removal (only non-comment changes are enumerated here): + + * emacs-lisp/bytecomp.el (byte-compile-version): Variable removed. + (byte-compile-insert-header): Don't use `byte-compile-version'. + * url/url-vars.el (url-version): Use the constant string "Emacs" + instead of calculating something from the RCS `State' keyword + [the latter is almost entirely useless anyway]. + * forms.el (forms-version): Variable removed. + (forms-mode): Don't use `forms-version'. + * recentf.el (recentf-version): Variable removed. + * progmodes/delphi.el (delphi-version): Variable removed. + * progmodes/ada-mode.el (ada-mode): RCS keyword removed from docstring. + 2004-04-09 Jesper Harder * info.el (info-apropos): Improve menu item regexp. diff --git a/lisp/allout.el b/lisp/allout.el index dc036637dfc..3fa04449e16 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -5,7 +5,6 @@ ;; Author: Ken Manheimer ;; Maintainer: Ken Manheimer ;; Created: Dec 1991 - first release to usenet -;; Version: $Id: allout.el,v 1.46 2004/03/01 22:44:04 lektu Exp $|| ;; Keywords: outlines mode wp languages ;; This file is part of GNU Emacs. @@ -508,7 +507,7 @@ behavior." ;;;_ : Version ;;;_ = allout-version (defvar allout-version - (let ((rcs-rev "$Revision: 1.46 $")) + (let ((rcs-rev "$Revision: 1.47 $")) (condition-case err (save-match-data (string-match "Revision: \\([0-9]+\\.[0-9]+\\)" rcs-rev) diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 7962a446eab..0caedee7c8a 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -5,7 +5,6 @@ ;; Author: Oliver Seidel ;; [Not clear the above works, July 2000] ;; Created: 2 Aug 1997 -;; Version: $Id: todo-mode.el,v 1.50 2001/12/11 07:36:30 pj Exp $ ;; Keywords: calendar, todo ;; This file is part of GNU Emacs. @@ -93,12 +92,6 @@ ;; extensions that are not explicitly listed in the above quick ;; installation. ;; -;; Version -;; -;; Which version of todo-mode.el does this documentation refer to? -;; -;; $Id: todo-mode.el,v 1.50 2001/12/11 07:36:30 pj Exp $ -;; ;; Pre-Requisites ;; ;; This package will require the following packages to be diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index e2a228c0d79..220a7d8d92d 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -8,10 +8,6 @@ ;; Maintainer: FSF ;; Keywords: lisp -;;; This version incorporates changes up to version 2.10 of the -;;; Zawinski-Furuseth compiler. -(defconst byte-compile-version "$Revision: 2.143 $") - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify @@ -1860,10 +1856,7 @@ With argument, insert value in current buffer after the form." " on " (current-time-string) "\n;;; from file " filename "\n") (insert ";;; in Emacs version " emacs-version "\n") - (insert ";;; with bytecomp version " - (progn (string-match "[0-9.]+" byte-compile-version) - (match-string 0 byte-compile-version)) - "\n;;; " + (insert ";;; " (cond ((eq byte-optimize 'source) "with source-level optimization only") ((eq byte-optimize 'byte) "with byte-level optimization only") diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el index 10aade7dc75..97c7d67ac53 100644 --- a/lisp/emacs-lisp/cl-specs.el +++ b/lisp/emacs-lisp/cl-specs.el @@ -7,7 +7,6 @@ ;; LCD Archive Entry: ;; cl-specs.el|Daniel LaLiberte|liberte@holonexus.org ;; |Edebug specs for cl.el -;; |$Date: 2003/06/16 16:27:27 $|1.1| ;; This file is part of GNU Emacs. diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 650b385ff45..bc868759d92 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -7,8 +7,6 @@ ;; Keywords: extensions ;; Created: 1995-10-06 -;; $Id: eldoc.el,v 1.26 2003/09/01 15:45:22 miles Exp $ - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/forms.el b/lisp/forms.el index 76d4bc48c4d..aa0582c918a 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -301,11 +301,6 @@ (provide 'forms) ;;; official (provide 'forms-mode) ;;; for compatibility -(defconst forms-version (substring "$Revision: 2.48 $" 11 -2) - "The version number of forms-mode (as string). The complete RCS id is: - - $Id: forms.el,v 2.48 2003/05/29 23:53:21 monnier Exp $") - (defcustom forms-mode-hook nil "Hook run upon entering Forms mode." :group 'forms @@ -694,7 +689,7 @@ Commands: Equivalent keys in read-only mode: ;;(message "forms: proceeding setup (new file)...") (progn (insert - "GNU Emacs Forms Mode version " forms-version "\n\n" + "GNU Emacs Forms Mode\n\n" (if (file-exists-p forms-file) (concat "No records available in file `" forms-file "'\n\n") (format "Creating new file `%s'\nwith %d field%s per record\n\n" diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index cbdb4fcb911..15d3eb0eb95 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -78,7 +78,6 @@ name (autoload (quote ada-mode) "ada-mode" "\ Ada mode is the major mode for editing Ada code. -This version was built on $Date: 2003/09/30 12:54:32 $. Bindings are as follows: (Note: 'LFD' is control-j.) \\{ada-mode-map} diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el index d64616dba8e..1ecedf515f9 100644 --- a/lisp/mail/metamail.el +++ b/lisp/mail/metamail.el @@ -3,7 +3,6 @@ ;; Copyright (C) 1993, 1996 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA -;; Version: $Id: metamail.el,v 1.15 2003/02/04 13:14:00 lektu Exp $ ;; Keywords: mail, news, mime, multimedia ;; This file is part of GNU Emacs. diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el index 772756033eb..fa7e0d1950e 100644 --- a/lisp/net/rlogin.el +++ b/lisp/net/rlogin.el @@ -6,8 +6,6 @@ ;; Maintainer: Noah Friedman ;; Keywords: unix, comm -;; $Id: rlogin.el,v 1.4 2003/05/06 17:46:28 lektu Exp $ - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/obsolete/rsz-mini.el b/lisp/obsolete/rsz-mini.el index f2f32964f5d..d44a88df801 100644 --- a/lisp/obsolete/rsz-mini.el +++ b/lisp/obsolete/rsz-mini.el @@ -7,8 +7,6 @@ ;; Maintainer: Noah Friedman ;; Keywords: minibuffer, window, frame, display -;; $Id: rsz-mini.el,v 1.1 2001/08/30 07:29:18 gerd Exp $ - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 310e2bc8889..edfa1859cc2 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -1071,7 +1071,6 @@ name" ;;;###autoload (defun ada-mode () "Ada mode is the major mode for editing Ada code. -This version was built on $Date: 2003/09/01 15:45:34 $. Bindings are as follows: (Note: 'LFD' is control-j.) \\{ada-mode-map} diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el index 30bdfc4ae41..de37da142c1 100644 --- a/lisp/progmodes/ada-prj.el +++ b/lisp/progmodes/ada-prj.el @@ -3,7 +3,6 @@ ;; Copyright (C) 1998, 99, 2000-2003 Free Software Foundation, Inc. ;; Author: Emmanuel Briot -;; Ada Core Technologies's version: $Revision: 1.12 $ ;; Keywords: languages, ada, project file ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el index 7b9f7649280..3262f41bb5f 100644 --- a/lisp/progmodes/ada-stmt.el +++ b/lisp/progmodes/ada-stmt.el @@ -3,8 +3,6 @@ ;; Copyright(C) 1987, 93, 94, 96, 97, 98, 99, 2000 ;; Free Software Foundation, Inc. -;; Ada Core Technologies's version: $Revision: 1.16 $ - ;; This file is part of GNU Emacs. ;; Authors: Daniel Pfeiffer, Markus Heritsch, Rolf Ebert diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index 09342e463c9..5bdb1fb25eb 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -4,7 +4,6 @@ ;; Author: Dave Love ;; Keywords: languages -;; $Revision: 1.5 $ ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el index ee4ca4b5786..4ebbc549697 100644 --- a/lisp/progmodes/delphi.el +++ b/lisp/progmodes/delphi.el @@ -64,12 +64,6 @@ (provide 'delphi) -(defconst delphi-version - (let ((revision "$Revision: 3.10 $")) - (string-match ": \\([^ ]+\\)" revision) - (match-string 1 revision)) - "Version of this delphi mode.") - (eval-and-compile ;; Allow execution on pre Emacs 20 versions. (or (fboundp 'when) diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index af62d1e3e74..a600939ef71 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -5,7 +5,6 @@ ;; Chris Chase ;; Maintainer: J.D. Smith ;; Version: 4.15 -;; Date: $Date: 2002/10/17 15:41:01 $ ;; Keywords: processes ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el index 79ca7b8d75b..dc28938d5c5 100644 --- a/lisp/progmodes/idlw-toolbar.el +++ b/lisp/progmodes/idlw-toolbar.el @@ -4,7 +4,6 @@ ;; Author: Carsten Dominik ;; Maintainer: J.D. Smith ;; Version: 4.15 -;; Date: $Date: 2003/02/04 13:24:35 $ ;; Keywords: processes ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index 83bf03f7c46..a49f70aa0b0 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -5,7 +5,6 @@ ;; Chris Chase ;; Maintainer: J.D. Smith ;; Version: 4.15 -;; Date: $Date: 2003/09/01 15:45:35 $ ;; Keywords: languages ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index db04986d54b..ac370cc1030 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el @@ -6,7 +6,6 @@ ;; Author: Tom Tromey ;; Chris Lindblad ;; Keywords: languages tcl modes -;; Version: $Revision: 1.75 $ ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 87ca4f11bd4..42aabace4d2 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -5,7 +5,6 @@ ;; Authors: Reto Zimmermann ;; Rodney J. Whitby ;; Maintainer: Reto Zimmermann -;; RCS: $Id: vhdl-mode.el,v 1.20 2003/03/05 07:50:38 lektu Exp $ ;; Keywords: languages vhdl ;; WWW: http://opensource.ethz.ch/emacs/vhdl-mode.html diff --git a/lisp/recentf.el b/lisp/recentf.el index f2700fcf210..7e379822457 100644 --- a/lisp/recentf.el +++ b/lisp/recentf.el @@ -8,8 +8,6 @@ ;; Maintainer: FSF ;; Keywords: files -(defconst recentf-version "$Revision: 1.27 $") - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/type-break.el b/lisp/type-break.el index b03cb680022..26ac7f87ecb 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -8,8 +8,6 @@ ;; Status: Works in GNU Emacs 19.25 or later, some versions of XEmacs ;; Created: 1994-07-13 -;; $Id: type-break.el,v 1.29 2003/09/01 15:45:17 miles Exp $ - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el index 00d0d595304..0586c76d6f9 100644 --- a/lisp/url/url-about.el +++ b/lisp/url/url-about.el @@ -1,7 +1,4 @@ ;;; url-about.el --- Show internal URLs -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el index 4165f44484a..e730a73eee3 100644 --- a/lisp/url/url-auth.el +++ b/lisp/url/url-auth.el @@ -1,7 +1,4 @@ ;;; url-auth.el --- Uniform Resource Locator authorization modules -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el index 7a6cc21383e..e76186faefc 100644 --- a/lisp/url/url-cache.el +++ b/lisp/url/url-cache.el @@ -1,7 +1,4 @@ ;;; url-cache.el --- Uniform Resource Locator retrieval tool -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el index 38ddd002daf..537412c95d2 100644 --- a/lisp/url/url-cid.el +++ b/lisp/url/url-cid.el @@ -1,7 +1,4 @@ ;;; url-cid.el --- Content-ID URL loader -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index d837077ade0..2b359f8554b 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -1,7 +1,4 @@ ;;; url-cookie.el --- Netscape Cookie support -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el index 573bcc26ce0..4e744b3da76 100644 --- a/lisp/url/url-dav.el +++ b/lisp/url/url-dav.el @@ -4,7 +4,6 @@ ;; Author: Bill Perry ;; Maintainer: Bill Perry -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: url, vc ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el index 0c97ff9dc13..da22ddc9a78 100644 --- a/lisp/url/url-dired.el +++ b/lisp/url/url-dired.el @@ -1,7 +1,4 @@ ;;; url-dired.el --- URL Dired minor mode -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, files ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el index 8fe9683acda..71b31a17c83 100644 --- a/lisp/url/url-expand.el +++ b/lisp/url/url-expand.el @@ -1,7 +1,4 @@ ;;; url-expand.el --- expand-file-name for URLs -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el index eeabc83e485..9cacf9bd468 100644 --- a/lisp/url/url-file.el +++ b/lisp/url/url-file.el @@ -1,7 +1,4 @@ ;;; url-file.el --- File retrieval code -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el index 1dc679a2418..925a6fb5238 100644 --- a/lisp/url/url-ftp.el +++ b/lisp/url/url-ftp.el @@ -1,7 +1,4 @@ ;;; url-ftp.el --- FTP wrapper -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el index 71e73ea14b7..538d607d327 100644 --- a/lisp/url/url-gw.el +++ b/lisp/url/url-gw.el @@ -1,7 +1,5 @@ ;;; url-gw.el --- Gateway munging for URL loading ;; Author: Bill Perry -;; Created: $Date: 2004/04/04 01:21:46 $ -;; $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el index d3f9800d0f0..4ef398cc9b3 100644 --- a/lisp/url/url-handlers.el +++ b/lisp/url/url-handlers.el @@ -1,7 +1,4 @@ ;;; url-handlers.el --- file-name-handler stuff for URL loading -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el index 44b269eeaee..633c22d1887 100644 --- a/lisp/url/url-history.el +++ b/lisp/url/url-history.el @@ -1,7 +1,4 @@ ;;; url-history.el --- Global history tracking for URL package -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index c0c0dd68a31..6596225e111 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -1,6 +1,5 @@ ;;; url-http.el --- HTTP retrieval routines ;; Author: Bill Perry -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-https.el b/lisp/url/url-https.el index d603740357e..9754cd1b976 100644 --- a/lisp/url/url-https.el +++ b/lisp/url/url-https.el @@ -1,7 +1,4 @@ ;;; url-https.el --- HTTP over SSL routines -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el index d5f1813a294..f99e607e3f6 100644 --- a/lisp/url/url-imap.el +++ b/lisp/url/url-imap.el @@ -1,7 +1,5 @@ ;;; url-imap.el --- IMAP retrieval routines ;; Author: Simon Josefsson -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el index 9ff4e122d52..6b62761d97a 100644 --- a/lisp/url/url-irc.el +++ b/lisp/url/url-irc.el @@ -1,7 +1,4 @@ ;;; url-irc.el --- IRC URL interface -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el index b2d7980be06..a36ea05a490 100644 --- a/lisp/url/url-ldap.el +++ b/lisp/url/url-ldap.el @@ -1,7 +1,4 @@ ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el index a8492834711..98ca6a9e62a 100644 --- a/lisp/url/url-mailto.el +++ b/lisp/url/url-mailto.el @@ -1,7 +1,4 @@ ;;; url-mail.el --- Mail Uniform Resource Locator retrieval code -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el index 89325e6c0b3..de457f5202a 100644 --- a/lisp/url/url-methods.el +++ b/lisp/url/url-methods.el @@ -1,7 +1,4 @@ ;;; url-methods.el --- Load URL schemes as needed -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 03:10:58 $ -;; Version: $Revision: 1.2 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el index 95a26ec4016..f6962f4fdee 100644 --- a/lisp/url/url-misc.el +++ b/lisp/url/url-misc.el @@ -1,7 +1,4 @@ ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el index 298c51dde89..8dc75608f4d 100644 --- a/lisp/url/url-news.el +++ b/lisp/url/url-news.el @@ -1,7 +1,4 @@ ;;; url-news.el --- News Uniform Resource Locator retrieval code -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el index a7ea476a647..c0ac4f5cb45 100644 --- a/lisp/url/url-nfs.el +++ b/lisp/url/url-nfs.el @@ -1,7 +1,4 @@ ;;; url-nfs.el --- NFS URL interface -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el index 759d2e00c1c..87304d4b31f 100644 --- a/lisp/url/url-ns.el +++ b/lisp/url/url-ns.el @@ -1,7 +1,4 @@ ;;; url-ns.el --- Various netscape-ish functions for proxy definitions -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el index dd08bc458bc..23837990b66 100644 --- a/lisp/url/url-parse.el +++ b/lisp/url/url-parse.el @@ -1,7 +1,4 @@ ;;; url-parse.el --- Uniform Resource Locator parser -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 03:10:58 $ -;; Version: $Revision: 1.2 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el index 00c5d899258..9fcfe8f04a3 100644 --- a/lisp/url/url-privacy.el +++ b/lisp/url/url-privacy.el @@ -1,7 +1,4 @@ ;;; url-privacy.el --- Global history tracking for URL package -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el index 9b4fdad09e5..5f4b341ab04 100644 --- a/lisp/url/url-proxy.el +++ b/lisp/url/url-proxy.el @@ -1,7 +1,4 @@ ;;; url-proxy.el --- Proxy server support -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index 109d88d5ebc..1472febd05c 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el @@ -1,7 +1,5 @@ ;;; url-util.el --- Miscellaneous helper routines for URL library ;; Author: Bill Perry -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 54698d33273..27b83541504 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -1,7 +1,4 @@ ;;; url-vars.el --- Variables for Uniform Resource Locator tool -;; Author: $Author: monnier $ -;; Created: $Date: 2004/04/04 01:21:46 $ -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -29,10 +26,7 @@ (require 'mm-util) (eval-when-compile (require 'cl)) -(defconst url-version (let ((x "$State: Exp $")) - (if (string-match "State: \\([^ \t\n]+\\)" x) - (substring x (match-beginning 1) (match-end 1)) - x)) +(defconst url-version "Emacs" "Version number of URL package.") (defgroup url nil diff --git a/lisp/url/url.el b/lisp/url/url.el index 34b8b03e865..269e7d437ce 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -1,6 +1,5 @@ ;;; url.el --- Uniform Resource Locator retrieval tool ;; Author: Bill Perry -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/url/vc-dav.el b/lisp/url/vc-dav.el index 3f468900441..e0e32f5da1a 100644 --- a/lisp/url/vc-dav.el +++ b/lisp/url/vc-dav.el @@ -4,7 +4,6 @@ ;; Author: Bill Perry ;; Maintainer: Bill Perry -;; Version: $Revision: 1.1.1.1 $ ;; Keywords: url, vc ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/lisp/whitespace.el b/lisp/whitespace.el index edff77211e0..e330febf938 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -5,7 +5,6 @@ ;; Author: Rajesh Vaidheeswarran ;; Keywords: convenience -;; $Id: whitespace.el,v 1.26 2003/09/01 15:45:18 miles Exp $ ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index de4109cb444..840c423471b 100644 --- a/oldXMenu/Activate.c +++ b/oldXMenu/Activate.c @@ -1,4 +1,3 @@ -/* $Header: /cvsroot/emacs/emacs/oldXMenu/Activate.c,v 1.5 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ #include "copyright.h" diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c index 5e1dcee0f88..b7b52c0f642 100644 --- a/oldXMenu/AddPane.c +++ b/oldXMenu/AddPane.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/AddPane.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c index 8a8e9dff50e..40bbbde704c 100644 --- a/oldXMenu/AddSel.c +++ b/oldXMenu/AddSel.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/AddSel.c,v 1.3 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/ChgPane.c b/oldXMenu/ChgPane.c index e92be93a2da..123f18dec5a 100644 --- a/oldXMenu/ChgPane.c +++ b/oldXMenu/ChgPane.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/ChgPane.c,v 1.1 1999/10/03 19:34:53 fx Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c index 60b2b2c909c..7dce694c410 100644 --- a/oldXMenu/ChgSel.c +++ b/oldXMenu/ChgSel.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/ChgSel.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index 9dcfeada285..bac3f079f60 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c @@ -1,4 +1,3 @@ -/* $Header: /cvsroot/emacs/emacs/oldXMenu/Create.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ #include "copyright.h" diff --git a/oldXMenu/DelPane.c b/oldXMenu/DelPane.c index aaa91db1e65..bdb084b36f3 100644 --- a/oldXMenu/DelPane.c +++ b/oldXMenu/DelPane.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/DelPane.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/DelSel.c b/oldXMenu/DelSel.c index 2b5cc7f7457..78b73113162 100644 --- a/oldXMenu/DelSel.c +++ b/oldXMenu/DelSel.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/DelSel.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c index 150d3e13544..8d904a53872 100644 --- a/oldXMenu/Destroy.c +++ b/oldXMenu/Destroy.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/Destroy.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/Error.c b/oldXMenu/Error.c index 400070827d9..1eb521b1642 100644 --- a/oldXMenu/Error.c +++ b/oldXMenu/Error.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/Error.c,v 1.1 1999/10/03 19:35:00 fx Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/EvHand.c b/oldXMenu/EvHand.c index 6e335a1b660..073d0ab90b4 100644 --- a/oldXMenu/EvHand.c +++ b/oldXMenu/EvHand.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/EvHand.c,v 1.1 1999/10/03 19:35:01 fx Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/FindPane.c b/oldXMenu/FindPane.c index 7950bc431aa..945d4595cab 100644 --- a/oldXMenu/FindPane.c +++ b/oldXMenu/FindPane.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/FindPane.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c index af3ce1324a6..1fed1114732 100644 --- a/oldXMenu/FindSel.c +++ b/oldXMenu/FindSel.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/FindSel.c,v 1.1 1999/10/03 19:35:03 fx Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c index 63116e63010..682423a4a05 100644 --- a/oldXMenu/InsPane.c +++ b/oldXMenu/InsPane.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/InsPane.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/InsSel.c b/oldXMenu/InsSel.c index f2b6b2627b4..f3e2c4d7fb0 100644 --- a/oldXMenu/InsSel.c +++ b/oldXMenu/InsSel.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/InsSel.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c index 70a917a8eff..f1367a07351 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/Internal.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/Locate.c b/oldXMenu/Locate.c index 1fbae84c881..47db7fa1103 100644 --- a/oldXMenu/Locate.c +++ b/oldXMenu/Locate.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/Locate.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/Post.c b/oldXMenu/Post.c index 8d850ca0815..3b39d796823 100644 --- a/oldXMenu/Post.c +++ b/oldXMenu/Post.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/Post.c,v 1.3 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/Recomp.c b/oldXMenu/Recomp.c index 952bf9f4b54..b4bc4da3f72 100644 --- a/oldXMenu/Recomp.c +++ b/oldXMenu/Recomp.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/Recomp.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/SetAEQ.c b/oldXMenu/SetAEQ.c index 3a3900400aa..daddc1aa946 100644 --- a/oldXMenu/SetAEQ.c +++ b/oldXMenu/SetAEQ.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetAEQ.c,v 1.1 1999/10/03 19:35:12 fx Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/SetFrz.c b/oldXMenu/SetFrz.c index 556eb0bf06b..243cc64e0ed 100644 --- a/oldXMenu/SetFrz.c +++ b/oldXMenu/SetFrz.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetFrz.c,v 1.1 1999/10/03 19:35:13 fx Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/SetPane.c b/oldXMenu/SetPane.c index 2c51e618937..39a87ac5ce3 100644 --- a/oldXMenu/SetPane.c +++ b/oldXMenu/SetPane.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetPane.c,v 1.1 1999/10/03 19:35:14 fx Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/SetSel.c b/oldXMenu/SetSel.c index cd67d79aeb2..4fe0c82a131 100644 --- a/oldXMenu/SetSel.c +++ b/oldXMenu/SetSel.c @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/SetSel.c,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h index 4ffe45adac8..e1abcbbe6c5 100644 --- a/oldXMenu/X10.h +++ b/oldXMenu/X10.h @@ -1,4 +1,3 @@ -/* $Header: /cvsroot/emacs/emacs/oldXMenu/X10.h,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* * Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology * diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c index 71c2aa20404..67239a26d31 100644 --- a/oldXMenu/XCrAssoc.c +++ b/oldXMenu/XCrAssoc.c @@ -1,4 +1,3 @@ -/* $XConsortium: XCrAssoc.c,v 10.17 91/01/06 12:04:57 rws Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c index a4c4b9f514d..1c72447f931 100644 --- a/oldXMenu/XDelAssoc.c +++ b/oldXMenu/XDelAssoc.c @@ -1,4 +1,3 @@ -/* $XConsortium: XDelAssoc.c,v 10.19 91/01/06 12:06:39 rws Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c index 84b7a4ddc2e..137c49f613d 100644 --- a/oldXMenu/XDestAssoc.c +++ b/oldXMenu/XDestAssoc.c @@ -1,4 +1,3 @@ -/* $XConsortium: XDestAssoc.c,v 10.17 91/02/08 13:11:50 rws Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c index 788eaaa4e1e..ea7303bad61 100644 --- a/oldXMenu/XLookAssoc.c +++ b/oldXMenu/XLookAssoc.c @@ -1,4 +1,3 @@ -/* $XConsortium: XLookAssoc.c,v 10.16 91/01/06 12:09:24 rws Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c index 408342d1c79..ffe19adc410 100644 --- a/oldXMenu/XMakeAssoc.c +++ b/oldXMenu/XMakeAssoc.c @@ -1,4 +1,3 @@ -/* $XConsortium: XMakeAssoc.c,v 10.18 91/01/06 12:09:28 rws Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h index c679a91e362..fde2a954620 100644 --- a/oldXMenu/XMenu.h +++ b/oldXMenu/XMenu.h @@ -1,6 +1,5 @@ #include "copyright.h" -/* $Header: /cvsroot/emacs/emacs/oldXMenu/XMenu.h,v 1.3 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h index 8e48645a2ce..e96dfb1e910 100644 --- a/oldXMenu/XMenuInt.h +++ b/oldXMenu/XMenuInt.h @@ -1,5 +1,4 @@ -/* $Header: /cvsroot/emacs/emacs/oldXMenu/XMenuInt.h,v 1.2 2003/02/04 14:19:01 lektu Exp $ */ /* Copyright Massachusetts Institute of Technology 1985 */ /* diff --git a/oldXMenu/copyright.h b/oldXMenu/copyright.h index 7b426cdb398..c5a4316043d 100644 --- a/oldXMenu/copyright.h +++ b/oldXMenu/copyright.h @@ -1,4 +1,3 @@ -/* $Header: /cvsroot/emacs/emacs/oldXMenu/copyright.h,v 1.1 1999/10/03 19:35:25 fx Exp $ */ /* Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology -- cgit v1.2.3 From 7d0e09557ffdbad584b3783db4fba99a5b6444ac Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 12 Apr 2004 03:11:10 +0000 Subject: (byte-compile-cond): Fix last change. --- lisp/emacs-lisp/bytecomp.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 220a7d8d92d..32d6694b060 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3377,12 +3377,13 @@ being undefined will be suppressed." (byte-compile-goto 'byte-goto donetag) (byte-compile-out-tag nexttag))))) ;; Last clause - (and (cdr clause) (not (eq (car clause) t)) - (progn (byte-compile-maybe-guarded (car clause) - (byte-compile-form (car clause))) - (byte-compile-goto-if nil for-effect donetag) - (setq clause (cdr clause)))) - (byte-compile-body-do-effect clause) + (let ((guard (car clause))) + (and (cdr clause) (not (eq guard t)) + (progn (byte-compile-form guard) + (byte-compile-goto-if nil for-effect donetag) + (setq clause (cdr clause)))) + (byte-compile-maybe-guarded guard + (byte-compile-body-do-effect clause))) (byte-compile-out-tag donetag))) (defun byte-compile-and (form) -- cgit v1.2.3 From a080ff233cc81c42c70faa374ac0f016dd61db58 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 14 Apr 2004 20:43:45 +0000 Subject: (batch-byte-compile-file): Give a backtrace if requested. --- lisp/emacs-lisp/bytecomp.el | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 32d6694b060..43e0732104f 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3966,27 +3966,29 @@ already up-to-date." (kill-emacs (if error 1 0)))) (defun batch-byte-compile-file (file) - (condition-case err + (if debug-on-error (byte-compile-file file) - (file-error - (message (if (cdr err) - ">>Error occurred processing %s: %s (%s)" + (condition-case err + (byte-compile-file file) + (file-error + (message (if (cdr err) + ">>Error occurred processing %s: %s (%s)" ">>Error occurred processing %s: %s") - file - (get (car err) 'error-message) - (prin1-to-string (cdr err))) - (let ((destfile (byte-compile-dest-file file))) - (if (file-exists-p destfile) - (delete-file destfile))) - nil) - (error - (message (if (cdr err) - ">>Error occurred processing %s: %s (%s)" + file + (get (car err) 'error-message) + (prin1-to-string (cdr err))) + (let ((destfile (byte-compile-dest-file file))) + (if (file-exists-p destfile) + (delete-file destfile))) + nil) + (error + (message (if (cdr err) + ">>Error occurred processing %s: %s (%s)" ">>Error occurred processing %s: %s") - file - (get (car err) 'error-message) - (prin1-to-string (cdr err))) - nil))) + file + (get (car err) 'error-message) + (prin1-to-string (cdr err))) + nil)))) ;;;###autoload (defun batch-byte-recompile-directory () -- cgit v1.2.3 From 0a0eb031ad22316fc25b80afbf1595e5bcdb59ac Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 21 Apr 2004 19:12:04 +0000 Subject: (byte-compile-no-warnings): Handle multiple args: compile like progn. --- lisp/emacs-lisp/bytecomp.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 43e0732104f..224fd366a41 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3716,7 +3716,8 @@ being undefined will be suppressed." (byte-defop-compiler-1 with-no-warnings byte-compile-no-warnings) (defun byte-compile-no-warnings (form) (let (byte-compile-warnings) - (byte-compile-form (cadr form)))) + (setcar form 'progn) + (byte-compile-form form))) ;;; tags -- cgit v1.2.3 From a4f66531945826f4a12d6c41bfa80ef89eff33ed Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 21 Apr 2004 19:13:00 +0000 Subject: Fix previous change. --- lisp/emacs-lisp/bytecomp.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 224fd366a41..07c361fc054 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3716,8 +3716,7 @@ being undefined will be suppressed." (byte-defop-compiler-1 with-no-warnings byte-compile-no-warnings) (defun byte-compile-no-warnings (form) (let (byte-compile-warnings) - (setcar form 'progn) - (byte-compile-form form))) + (byte-compile-form (cons 'progn (cdr form))))) ;;; tags -- cgit v1.2.3 From 6f8e359068d4ce8c5253db802cf540133aae82c6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 21 Apr 2004 22:34:27 +0000 Subject: (batch-byte-recompile-directory): Add byte-recompile-directory's opt `arg'. --- lisp/emacs-lisp/bytecomp.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 07c361fc054..f6e2946aa8b 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -3991,7 +3991,7 @@ already up-to-date." nil)))) ;;;###autoload -(defun batch-byte-recompile-directory () +(defun batch-byte-recompile-directory (&optional arg) "Run `byte-recompile-directory' on the dirs remaining on the command line. Must be used only with `-batch', and kills Emacs on completion. For example, invoke `emacs -batch -f batch-byte-recompile-directory .'." @@ -4002,7 +4002,7 @@ For example, invoke `emacs -batch -f batch-byte-recompile-directory .'." (or command-line-args-left (setq command-line-args-left '("."))) (while command-line-args-left - (byte-recompile-directory (car command-line-args-left)) + (byte-recompile-directory (car command-line-args-left) arg) (setq command-line-args-left (cdr command-line-args-left))) (kill-emacs 0)) -- cgit v1.2.3 From b88a41d0064828aab6c75d7a8c6f543022fa5dd5 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 19 May 2004 18:53:13 +0000 Subject: (byte-compile-log): Use backquotes. (byte-compile-log-1): Don't call (byte-goto-log-buffer). Use with-current-buffer. (byte-goto-log-buffer): Delete. (byte-compile-log-file): Call compilation-forget-errors. --- lisp/emacs-lisp/bytecomp.el | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index f6e2946aa8b..8e20925c70d 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -832,24 +832,22 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." ;; Log something that isn't a warning. (defmacro byte-compile-log (format-string &rest args) - (list 'and - 'byte-optimize - '(memq byte-optimize-log '(t source)) - (list 'let '((print-escape-newlines t) - (print-level 4) - (print-length 4)) - (list 'byte-compile-log-1 - (cons 'format - (cons format-string - (mapcar - (lambda (x) - (if (symbolp x) (list 'prin1-to-string x) x)) - args))))))) + `(and + byte-optimize + (memq byte-optimize-log '(t source)) + (let ((print-escape-newlines t) + (print-level 4) + (print-length 4)) + (byte-compile-log-1 + (format + ,format-string + ,@(mapcar + (lambda (x) (if (symbolp x) (list 'prin1-to-string x) x)) + args)))))) ;; Log something that isn't a warning. (defun byte-compile-log-1 (string) - (save-excursion - (byte-goto-log-buffer) + (with-current-buffer "*Compile-Log*" (goto-char (point-max)) (byte-compile-warning-prefix nil nil) (cond (noninteractive @@ -903,11 +901,6 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." (defvar byte-compile-last-warned-form nil) (defvar byte-compile-last-logged-file nil) -(defun byte-goto-log-buffer () - (set-buffer (get-buffer-create "*Compile-Log*")) - (unless (eq major-mode 'compilation-mode) - (compilation-mode))) - ;; This is used as warning-prefix for the compiler. ;; It is always called with the warnings buffer current. (defun byte-compile-warning-prefix (level entry) @@ -983,6 +976,7 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." ;; Do this after setting default-directory. (unless (eq major-mode 'compilation-mode) (compilation-mode)) + (compilation-forget-errors) pt)))) ;; Log a message STRING in *Compile-Log*. -- cgit v1.2.3 From 1d5c17c0d3f5a47b8c95552de40411519a989aaf Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 13 Jun 2004 22:01:36 +0000 Subject: Put `...' around symbols in warning messages. --- lisp/emacs-lisp/bytecomp.el | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'lisp/emacs-lisp/bytecomp.el') diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 8e20925c70d..a4ae751cab7 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1008,11 +1008,11 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'." (when (nth 2 new))) (byte-compile-set-symbol-position (car form)) (if (memq 'obsolete byte-compile-warnings) - (byte-compile-warn "%s is an obsolete function%s; %s" (car form) + (byte-compile-warn "`%s' is an obsolete function%s; %s" (car form) (if when (concat " since " when) "") (if (stringp (car new)) (car new) - (format "use %s instead." (car new))))) + (format "use `%s' instead." (car new))))) (funcall (or handler 'byte-compile-normal-call) form))) ;; Compiler options @@ -2076,7 +2076,7 @@ list that represents a doc string reference. (defun byte-compile-file-form-defsubst (form) (when (assq (nth 1 form) byte-compile-unresolved-functions) (setq byte-compile-current-form (nth 1 form)) - (byte-compile-warn "defsubst %s was used before it was defined" + (byte-compile-warn "defsubst `%s' was used before it was defined" (nth 1 form))) (byte-compile-file-form (macroexpand form byte-compile-macro-environment)) @@ -2206,7 +2206,7 @@ list that represents a doc string reference. (not (assq (nth 1 form) byte-compile-initial-macro-environment))) (byte-compile-warn - "%s defined multiple times, as both function and macro" + "`%s' defined multiple times, as both function and macro" (nth 1 form))) (setcdr that-one nil)) (this-one @@ -2215,14 +2215,14 @@ list that represents a doc string reference. ;; byte-compiler macros in byte-run.el... (not (assq (nth 1 form) byte-compile-initial-macro-environment))) - (byte-compile-warn "%s %s defined multiple times in this file" + (byte-compile-warn "%s `%s' defined multiple times in this file" (if macrop "macro" "function") (nth 1 form)))) ((and (fboundp name) (eq (car-safe (symbol-function name)) (if macrop 'lambda 'macro))) (when (memq 'redefine byte-compile-warnings) - (byte-compile-warn "%s %s being redefined as a %s" + (byte-compile-warn "%s `%s' being redefined as a %s" (if macrop "function" "macro") (nth 1 form) (if macrop "macro" "function"))) @@ -2695,7 +2695,7 @@ If FORM is a lambda or a macro, byte-compile it as a function." (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)) + (byte-compile-warn "`%s' called as a function" fn)) (if (and handler (or (not (byte-compile-version-cond byte-compile-compatibility)) @@ -2730,9 +2730,9 @@ If FORM is a lambda or a macro, byte-compile it as a function." (if (or (not (symbolp var)) (byte-compile-const-symbol-p var (not (eq base-op 'byte-varref)))) (byte-compile-warn - (cond ((eq base-op 'byte-varbind) "attempt to let-bind %s %s") - ((eq base-op 'byte-varset) "variable assignment to %s %s") - (t "variable reference to %s %s")) + (cond ((eq base-op 'byte-varbind) "attempt to let-bind %s `%s'") + ((eq base-op 'byte-varset) "variable assignment to %s `%s'") + (t "variable reference to %s `%s'")) (if (symbolp var) "constant" "nonvariable") (prin1-to-string var)) (if (and (get var 'byte-obsolete-variable) @@ -2740,11 +2740,11 @@ If FORM is a lambda or a macro, byte-compile it as a function." (not (eq var byte-compile-not-obsolete-var))) (let* ((ob (get var 'byte-obsolete-variable)) (when (cdr ob))) - (byte-compile-warn "%s is an obsolete variable%s; %s" var + (byte-compile-warn "`%s' is an obsolete variable%s; %s" var (if when (concat " since " when) "") (if (stringp (car ob)) (car ob) - (format "use %s instead." (car ob)))))) + (format "use `%s' instead." (car ob)))))) (if (memq 'free-vars byte-compile-warnings) (if (eq base-op 'byte-varbind) (push var byte-compile-bound-variables) @@ -2753,11 +2753,11 @@ If FORM is a lambda or a macro, byte-compile it as a function." (if (eq base-op 'byte-varset) (or (memq var byte-compile-free-assignments) (progn - (byte-compile-warn "assignment to free variable %s" var) + (byte-compile-warn "assignment to free variable `%s'" var) (push var byte-compile-free-assignments))) (or (memq var byte-compile-free-references) (progn - (byte-compile-warn "reference to free variable %s" var) + (byte-compile-warn "reference to free variable `%s'" var) (push var byte-compile-free-references)))))))) (let ((tmp (assq var byte-compile-variables))) (unless tmp @@ -2958,7 +2958,7 @@ If FORM is a lambda or a macro, byte-compile it as a function." (defun byte-compile-subr-wrong-args (form n) (byte-compile-set-symbol-position (car form)) - (byte-compile-warn "%s called with %d arg%s, but requires %s" + (byte-compile-warn "`%s' called with %d arg%s, but requires %s" (car form) (length (cdr form)) (if (= 1 (length (cdr form))) "" "s") n) ;; get run-time wrong-number-of-args error. @@ -3124,7 +3124,7 @@ If FORM is a lambda or a macro, byte-compile it as a function." (if (and (consp (car body)) (not (eq 'byte-code (car (car body))))) (byte-compile-warn - "A quoted lambda form is the second argument of fset. This is probably + "A quoted lambda form is the second argument of `fset'. This is probably not what you want, as that lambda cannot be compiled. Consider using the syntax (function (lambda (...) ...)) instead."))))) (byte-compile-two-args form)) @@ -3507,7 +3507,7 @@ being undefined will be suppressed." (byte-compile-set-symbol-position 'condition-case) (unless (symbolp var) (byte-compile-warn - "%s is not a variable-name or nil (in condition-case)" var)) + "`%s' is not a variable-name or nil (in condition-case)" var)) (byte-compile-push-constant var) (byte-compile-push-constant (byte-compile-top-level (nth 2 form) for-effect)) @@ -3525,13 +3525,13 @@ being undefined will be suppressed." (setq syms (cdr syms))) ok)))) (byte-compile-warn - "%s is not a condition name or list of such (in condition-case)" + "`%s' is not a condition name or list of such (in condition-case)" (prin1-to-string condition))) ;; ((not (or (eq condition 't) ;; (and (stringp (get condition 'error-message)) ;; (consp (get condition 'error-conditions))))) ;; (byte-compile-warn -;; "%s is not a known condition name (in condition-case)" +;; "`%s' is not a known condition name (in condition-case)" ;; condition)) ) (setq compiled-clauses @@ -3627,7 +3627,7 @@ being undefined will be suppressed." (and (eq fun 'defconst) (null (cddr form)))) (let ((ncall (length (cdr form)))) (byte-compile-warn - "%s called with %d argument%s, but %s %s" + "`%s' called with %d argument%s, but %s %s" fun ncall (if (= 1 ncall) "" "s") (if (< ncall 2) "requires" "accepts only") @@ -3644,7 +3644,7 @@ being undefined will be suppressed." `(push ',var current-load-list)) (when (> (length form) 3) (when (and string (not (stringp string))) - (byte-compile-warn "third arg to %s %s is not a string: %s" + (byte-compile-warn "third arg to `%s %s' is not a string: %s" fun var string)) `(put ',var 'variable-documentation ,string)) (if (cddr form) ; `value' provided -- cgit v1.2.3