Commit 8a946354 authored by Sam Steingold's avatar Sam Steingold

Converted backquote to the new style.

parent c6aedc92
2001-11-27 Sam Steingold <sds@gnu.org>
* ansi-color.el, bookmark.el, dired.el, emerge.el, fast-lock.el
* lazy-lock.el, mouse-sel.el, mail/feedmail.el
* emacs-lisp/advice.el, emacs-lisp/checkdoc.el, emacs-lisp/ewoc.el
* obsolete/c-mode.el, obsolete/cplus-md.el
* progmodes/dcl-mode.el, progmodes/idlw-shell.el, progmodes/idlwave.el
* term/sun-mouse.el, textmodes/artist.el:
Converted backquote to the new style.
2001-11-27 Richard M. Stallman <rms@gnu.org>
* cus-edit.el (custom-load-symbol): Don't always load locate-library.
......
......@@ -228,14 +228,14 @@ This is a good function to put in `comint-output-filter-functions'."
;; Probably most of this is not needed?
(defmacro save-buffer-state (varlist &rest body)
"Bind variables according to VARLIST and eval BODY restoring buffer state."
(` (let* ((,@ (append varlist
`(let* (,@(append varlist
'((modified (buffer-modified-p)) (buffer-undo-list t)
(inhibit-read-only t) (inhibit-point-motion-hooks t)
before-change-functions after-change-functions
deactivate-mark buffer-file-name buffer-file-truename))))
(,@ body)
deactivate-mark buffer-file-name buffer-file-truename)))
,@body
(when (and (not modified) (buffer-modified-p))
(set-buffer-modified-p nil)))))
(set-buffer-modified-p nil))))
(put 'save-buffer-state 'lisp-indent-function 1))
(defun ansi-color-unfontify-region (beg end &rest xemacs-stuff)
......
......@@ -539,21 +539,20 @@ being set. This might change someday.
Optional second arg INFO-NODE means this bookmark is at info node
INFO-NODE, so record this fact in the bookmark's entry."
(let ((the-record
(` ((filename . (, (bookmark-buffer-file-name)))
`((filename . ,(bookmark-buffer-file-name))
(front-context-string
. (, (if (>= (- (point-max) (point)) bookmark-search-size)
. ,(if (>= (- (point-max) (point)) bookmark-search-size)
(buffer-substring-no-properties
(point)
(+ (point) bookmark-search-size))
nil)))
nil))
(rear-context-string
. (, (if (>= (- (point) (point-min)) bookmark-search-size)
. ,(if (>= (- (point) (point-min)) bookmark-search-size)
(buffer-substring-no-properties
(point)
(- (point) bookmark-search-size))
nil)))
(position . (, (point)))
))))
nil))
(position . ,(point)))))
;; Now fill in the optional parts:
......@@ -661,11 +660,11 @@ affect point."
(ann (nth 4 record)))
(list
name
(` ((filename . (, filename))
(front-context-string . (, (or front-str "")))
(rear-context-string . (, (or rear-str "")))
(position . (, position))
(annotation . (, ann)))))))
`((filename . ,filename)
(front-context-string . ,(or front-str ""))
(rear-context-string . ,(or rear-str ""))
(position . ,position)
(annotation . ,ann)))))
old-list))
......
......@@ -317,26 +317,26 @@ Subexpression 2 must end right before the \\n or \\r.")
;; It should end with a noun that can be pluralized by adding `s'.
;; Return value is the number of files marked, or nil if none were marked.
(defmacro dired-mark-if (predicate msg)
(` (let (buffer-read-only count)
`(let (buffer-read-only count)
(save-excursion
(setq count 0)
(if (, msg) (message "Marking %ss..." (, msg)))
(if ,msg (message "Marking %ss..." ,msg))
(goto-char (point-min))
(while (not (eobp))
(if (, predicate)
(if ,predicate
(progn
(delete-char 1)
(insert dired-marker-char)
(setq count (1+ count))))
(forward-line 1))
(if (, msg) (message "%s %s%s %s%s."
(if ,msg (message "%s %s%s %s%s."
count
(, msg)
,msg
(dired-plural-s count)
(if (eq dired-marker-char ?\040) "un" "")
(if (eq dired-marker-char dired-del-marker)
"flagged" "marked"))))
(and (> count 0) count))))
(and (> count 0) count)))
(defmacro dired-map-over-marks (body arg &optional show-progress)
"Eval BODY with point on each marked line. Return a list of BODY's results.
......
This diff is collapsed.
......@@ -187,7 +187,7 @@
(defmacro custom-add-option (&rest args)
nil)
(defmacro defcustom (var value doc &rest args)
(` (defvar (, var) (, value) (, doc))))))
`(defvar ,var ,value ,doc))))
(defcustom checkdoc-autofix-flag 'semiautomatic
"*Non-nil means attempt auto-fixing of doc strings.
......
......@@ -219,14 +219,14 @@ buffer will *not* have been changed.
Return value of last form in FORMS."
(let ((old-buffer (make-symbol "old-buffer"))
(hnd (make-symbol "ewoc")))
(` (let* (((, old-buffer) (current-buffer))
((, hnd) (, ewoc))
(dll (ewoc--dll (, hnd)))
(,@ varlist))
(set-buffer (ewoc--buffer (, hnd)))
`(let* ((,old-buffer (current-buffer))
(,hnd ,ewoc)
(dll (ewoc--dll ,hnd))
,@varlist)
(set-buffer (ewoc--buffer ,hnd))
(unwind-protect
(progn (,@ forms))
(set-buffer (, old-buffer)))))))
(progn ,@forms)
(set-buffer ,old-buffer)))))
(defmacro ewoc--set-buffer-bind-dll (ewoc &rest forms)
`(ewoc--set-buffer-bind-dll-let* ,ewoc nil ,@forms))
......
......@@ -57,12 +57,12 @@
(defmacro emerge-eval-in-buffer (buffer &rest forms)
"Macro to switch to BUFFER, evaluate FORMS, returns to original buffer.
Differs from `save-excursion' in that it doesn't save the point and mark."
(` (let ((StartBuffer (current-buffer)))
`(let ((StartBuffer (current-buffer)))
(unwind-protect
(progn
(set-buffer (, buffer))
(,@ forms))
(set-buffer StartBuffer)))))
(set-buffer ,buffer)
,@forms)
(set-buffer StartBuffer))))
(defmacro emerge-defvar-local (var value doc)
"Defines SYMBOL as an advertised variable.
......@@ -70,10 +70,10 @@ Performs a defvar, then executes `make-variable-buffer-local' on
the variable. Also sets the `preserved' property, so that
`kill-all-local-variables' (called by major-mode setting commands)
won't destroy Emerge control variables."
(` (progn
(defvar (, var) (, value) (, doc))
(make-variable-buffer-local '(, var))
(put '(, var) 'preserved t))))
`(progn
(defvar ,var ,value ,doc)
(make-variable-buffer-local ',var)
(put ',var 'preserved t)))
;; Add entries to minor-mode-alist so that emerge modes show correctly
(defvar emerge-minor-modes-list
......@@ -587,7 +587,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp
(setq file-A temp
startup-hooks
(cons (` (lambda () (delete-file (, file-A))))
(cons `(lambda () (delete-file ,file-A))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
......@@ -598,7 +598,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp
(setq file-B temp
startup-hooks
(cons (` (lambda () (delete-file (, file-B))))
(cons `(lambda () (delete-file ,file-B))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
......@@ -741,7 +741,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp
(setq file-A temp
startup-hooks
(cons (` (lambda () (delete-file (, file-A))))
(cons `(lambda () (delete-file ,file-A))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
......@@ -752,7 +752,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp
(setq file-B temp
startup-hooks
(cons (` (lambda () (delete-file (, file-B))))
(cons `(lambda () (delete-file ,file-B))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
......@@ -763,7 +763,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp
(setq file-ancestor temp
startup-hooks
(cons (` (lambda () (delete-file (, file-ancestor))))
(cons `(lambda () (delete-file ,file-ancestor))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
......@@ -901,7 +901,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(emerge-read-file-name "Output file" emerge-last-dir-output
f f nil)))))
(if file-out
(add-hook 'quit-hooks (` (lambda () (emerge-files-exit (, file-out))))))
(add-hook 'quit-hooks `(lambda () (emerge-files-exit ,file-out))))
(emerge-files-internal
file-A file-B startup-hooks
quit-hooks
......@@ -923,7 +923,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(emerge-read-file-name "Output file" emerge-last-dir-output
f f nil)))))
(if file-out
(add-hook 'quit-hooks (` (lambda () (emerge-files-exit (, file-out))))))
(add-hook 'quit-hooks `(lambda () (emerge-files-exit ,file-out))))
(emerge-files-with-ancestor-internal
file-A file-B file-ancestor startup-hooks
quit-hooks
......@@ -951,9 +951,9 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(write-region (point-min) (point-max) emerge-file-B nil 'no-message))
(emerge-setup (get-buffer buffer-A) emerge-file-A
(get-buffer buffer-B) emerge-file-B
(cons (` (lambda ()
(delete-file (, emerge-file-A))
(delete-file (, emerge-file-B))))
(cons `(lambda ()
(delete-file ,emerge-file-A)
(delete-file ,emerge-file-B))
startup-hooks)
quit-hooks
nil)))
......@@ -982,11 +982,11 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(get-buffer buffer-B) emerge-file-B
(get-buffer buffer-ancestor)
emerge-file-ancestor
(cons (` (lambda ()
(delete-file (, emerge-file-A))
(delete-file (, emerge-file-B))
(cons `(lambda ()
(delete-file ,emerge-file-A)
(delete-file ,emerge-file-B)
(delete-file
(, emerge-file-ancestor))))
,emerge-file-ancestor))
startup-hooks)
quit-hooks
nil)))
......@@ -1001,7 +1001,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(setq command-line-args-left (nthcdr 3 command-line-args-left))
(emerge-files-internal
file-a file-b nil
(list (` (lambda () (emerge-command-exit (, file-out))))))))
(list `(lambda () (emerge-command-exit ,file-out))))))
;;;###autoload
(defun emerge-files-with-ancestor-command ()
......@@ -1023,7 +1023,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(setq command-line-args-left (nthcdr 4 command-line-args-left)))
(emerge-files-with-ancestor-internal
file-a file-b file-anc nil
(list (` (lambda () (emerge-command-exit (, file-out))))))))
(list `(lambda () (emerge-command-exit ,file-out))))))
(defun emerge-command-exit (file-out)
(emerge-write-and-delete file-out)
......@@ -1036,7 +1036,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(setq emerge-file-out file-out)
(emerge-files-internal
file-a file-b nil
(list (` (lambda () (emerge-remote-exit (, file-out) '(, emerge-exit-func)))))
(list `(lambda () (emerge-remote-exit ,file-out ',emerge-exit-func)))
file-out)
(throw 'client-wait nil))
......@@ -1045,7 +1045,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(setq emerge-file-out file-out)
(emerge-files-with-ancestor-internal
file-a file-b file-anc nil
(list (` (lambda () (emerge-remote-exit (, file-out) '(, emerge-exit-func)))))
(list `(lambda () (emerge-remote-exit ,file-out ',emerge-exit-func)))
file-out)
(throw 'client-wait nil))
......@@ -1070,9 +1070,9 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(emerge-revisions-internal
file revision-A revision-B startup-hooks
(if arg
(cons (` (lambda ()
(cons `(lambda ()
(shell-command
(, (format "%s %s" emerge-rcs-ci-program file)))))
,(format "%s %s" emerge-rcs-ci-program file)))
quit-hooks)
quit-hooks)))
......@@ -1095,9 +1095,9 @@ This is *not* a user option, since Emerge uses it for its own processing.")
file revision-A revision-B ancestor startup-hooks
(if arg
(let ((cmd ))
(cons (` (lambda ()
(cons `(lambda ()
(shell-command
(, (format "%s %s" emerge-rcs-ci-program file)))))
,(format "%s %s" emerge-rcs-ci-program file)))
quit-hooks))
quit-hooks)))
......@@ -1127,11 +1127,11 @@ This is *not* a user option, since Emerge uses it for its own processing.")
;; Do the merge
(emerge-setup buffer-A emerge-file-A
buffer-B emerge-file-B
(cons (` (lambda ()
(delete-file (, emerge-file-A))
(delete-file (, emerge-file-B))))
(cons `(lambda ()
(delete-file ,emerge-file-A)
(delete-file ,emerge-file-B))
startup-hooks)
(cons (` (lambda () (emerge-files-exit (, file))))
(cons `(lambda () (emerge-files-exit ,file))
quit-hooks)
nil)))
......@@ -1175,12 +1175,12 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(emerge-setup-with-ancestor
buffer-A emerge-file-A buffer-B emerge-file-B
buffer-ancestor emerge-ancestor
(cons (` (lambda ()
(delete-file (, emerge-file-A))
(delete-file (, emerge-file-B))
(delete-file (, emerge-ancestor))))
(cons `(lambda ()
(delete-file ,emerge-file-A)
(delete-file ,emerge-file-B)
(delete-file ,emerge-ancestor))
startup-hooks)
(cons (` (lambda () (emerge-files-exit (, file))))
(cons `(lambda () (emerge-files-exit ,file))
quit-hooks)
output-file)))
......@@ -1263,9 +1263,9 @@ Otherwise, the A or B file present is copied to the output file."
nil
;; When done, return to this buffer.
(list
(` (lambda ()
(switch-to-buffer (, (current-buffer)))
(message "Merge done."))))))
`(lambda ()
(switch-to-buffer ,(current-buffer))
(message "Merge done.")))))
;; Merge of two files without ancestor
((and file-A file-B)
(message "Merging %s and %s..." file-A file-B)
......@@ -1273,9 +1273,9 @@ Otherwise, the A or B file present is copied to the output file."
nil
;; When done, return to this buffer.
(list
(` (lambda ()
(switch-to-buffer (, (current-buffer)))
(message "Merge done."))))))
`(lambda ()
(switch-to-buffer ,(current-buffer))
(message "Merge done.")))))
;; There is an output file (or there would have been an error above),
;; but only one input file.
;; The file appears to have been deleted in one version; do nothing.
......
......@@ -194,44 +194,44 @@
;; We use this to preserve or protect things when modifying text properties.
(defmacro save-buffer-state (varlist &rest body)
"Bind variables according to VARLIST and eval BODY restoring buffer state."
(` (let* ((,@ (append varlist
`(let* (,@(append varlist
'((modified (buffer-modified-p)) (buffer-undo-list t)
(inhibit-read-only t) (inhibit-point-motion-hooks t)
before-change-functions after-change-functions
deactivate-mark buffer-file-name buffer-file-truename))))
(,@ body)
deactivate-mark buffer-file-name buffer-file-truename)))
,@body
(when (and (not modified) (buffer-modified-p))
(set-buffer-modified-p nil)))))
(set-buffer-modified-p nil))))
(put 'save-buffer-state 'lisp-indent-function 1)
;;
;; We use this to verify that a face should be saved.
(defmacro fast-lock-save-facep (face)
"Return non-nil if FACE is one of `fast-lock-save-faces'."
(` (or (null fast-lock-save-faces)
(if (symbolp (, face))
(memq (, face) fast-lock-save-faces)
(let ((faces (, face)))
`(or (null fast-lock-save-faces)
(if (symbolp ,face)
(memq ,face fast-lock-save-faces)
(let ((faces ,face))
(while (unless (memq (car faces) fast-lock-save-faces)
(setq faces (cdr faces))))
faces)))))
faces))))
;;
;; We use this for compatibility with a future Emacs.
(or (fboundp 'with-temp-message)
(defmacro with-temp-message (message &rest body)
(` (let ((temp-message (, message)) current-message)
`(let ((temp-message ,message) current-message)
(unwind-protect
(progn
(when temp-message
(setq current-message (current-message))
(message temp-message))
(,@ body))
,@body)
(when temp-message
(message current-message)))))))
(message current-message))))))
;;
;; We use this for compatibility with a future Emacs.
(or (fboundp 'defcustom)
(defmacro defcustom (symbol value doc &rest args)
(` (defvar (, symbol) (, value) (, doc))))))
`(defvar ,symbol ,value ,doc))))
;(defun fast-lock-submit-bug-report ()
; "Submit via mail a bug report on fast-lock.el."
......
......@@ -277,14 +277,14 @@
;; We use this to preserve or protect things when modifying text properties.
(defmacro save-buffer-state (varlist &rest body)
"Bind variables according to VARLIST and eval BODY restoring buffer state."
(` (let* ((,@ (append varlist
`(let* (,@(append varlist
'((modified (buffer-modified-p)) (buffer-undo-list t)
(inhibit-read-only t) (inhibit-point-motion-hooks t)
before-change-functions after-change-functions
deactivate-mark buffer-file-name buffer-file-truename))))
(,@ body)
deactivate-mark buffer-file-name buffer-file-truename)))
,@body
(when (and (not modified) (buffer-modified-p))
(set-buffer-modified-p nil)))))
(set-buffer-modified-p nil))))
(put 'save-buffer-state 'lisp-indent-function 1)
;;
;; We use this for clarity and speed. Naughty but nice.
......@@ -292,7 +292,7 @@
"(do-while TEST BODY...): eval BODY... and repeat if TEST yields non-nil.
The order of execution is thus BODY, TEST, BODY, TEST and so on
until TEST returns nil."
(` (while (progn (,@ body) (, test)))))
`(while (progn ,@body ,test)))
(put 'do-while 'lisp-indent-function (get 'while 'lisp-indent-function)))
(defvar lazy-lock-mode nil) ; Whether we are turned on.
......
......@@ -300,7 +300,7 @@
(defmacro defgroup (&rest args)
nil)
(defmacro defcustom (var value doc &rest args)
(` (defvar (, var) (, value) (, doc))))))
`(defvar ,var ,value ,doc))))
(eval-when-compile (require 'smtpmail))
(autoload 'mail-do-fcc "sendmail")
......
......@@ -437,9 +437,8 @@ dragged right-to-left."
"Evaluate forms at mouse position.
Move to the end position of EVENT, execute FORMS, and restore original
point and window."
(`
(let ((posn (event-end (, event))))
(if posn (mouse-minibuffer-check (, event)))
`(let ((posn (event-end ,event)))
(if posn (mouse-minibuffer-check ,event))
(if (and posn (not (windowp (posn-window posn))))
(error "Cursor not in text area of window"))
(let (orig-window orig-point-marker)
......@@ -450,11 +449,10 @@ point and window."
(goto-char (posn-point posn)))
(unwind-protect
(progn
(,@ forms))
,@forms)
(goto-char (marker-position orig-point-marker))
(move-marker orig-point-marker nil)
(select-window orig-window)
)))))
(select-window orig-window)))))
(put 'mouse-sel-eval-at-event-end 'lisp-indent-hook 1)
......
......@@ -207,10 +207,8 @@ regardless of where in the line point is when the TAB command is used."
;; This is actually the expression for C++ mode, but it's used for C too.
(defvar c-imenu-generic-expression
(`
((nil
(,
(concat
`((nil
,(concat
"^" ; beginning of line is required
"\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
"\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; type specs; there can be no
......@@ -234,72 +232,72 @@ regardless of where in the line point is when the TAB command is used."
; surrounding the parameters
; (like "int foo(int a=bar()) {...}"
)) 6)
) 6)
("Class"
(, (concat
,(concat
"^" ; beginning of line is required
"\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
"class[ \t]+"
"\\([a-zA-Z0-9_]+\\)" ; this is the string we want to get
"[ \t]*[:{]"
)) 2)
;; Example of generic expression for finding prototypes, structs, unions, enums.
;; Uncomment if you want to find these too. It will be a bit slower gathering
;; the indexes.
; ("Prototypes"
; (,
; (concat
; "^" ; beginning of line is required
; "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
; "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; type specs; there can be no
; "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; more than 3 tokens, right?
; "\\(" ; last type spec including */&
; "[a-zA-Z0-9_:]+"
; "\\([ \t]*[*&]+[ \t]*\\|[ \t]+\\)" ; either pointer/ref sign or whitespace
; "\\)?" ; if there is a last type spec
; "\\(" ; name; take that into the imenu entry
; "[a-zA-Z0-9_:~]+" ; member function, ctor or dtor...
; ; (may not contain * because then
; ; "a::operator char*" would become "char*"!)
; "\\|"
; "\\([a-zA-Z0-9_:~]*::\\)?operator"
; "[^a-zA-Z1-9_][^(]*" ; ...or operator
; " \\)"
; "[ \t]*([^)]*)[ \t\n]*;" ; require ';' after
; ; the (...) Can't
; ; catch cases with () inside the parentheses
; ; surrounding the parameters
; ; (like "int foo(int a=bar());"
; )) 6)
; ("Struct"
; (, (concat
; "^" ; beginning of line is required
; "\\(static[ \t]+\\)?" ; there may be static or const.
; "\\(const[ \t]+\\)?"
; "struct[ \t]+"
; "\\([a-zA-Z0-9_]+\\)" ; this is the string we want to get
; "[ \t]*[{]"
; )) 3)
; ("Enum"
; (, (concat
; "^" ; beginning of line is required
; "\\(static[ \t]+\\)?" ; there may be static or const.
; "\\(const[ \t]+\\)?"
; "enum[ \t]+"
; "\\([a-zA-Z0-9_]+\\)" ; this is the string we want to get
; "[ \t]*[{]"
; )) 3)
; ("Union"
; (, (concat
; "^" ; beginning of line is required
; "\\(static[ \t]+\\)?" ; there may be static or const.
; "\\(const[ \t]+\\)?"
; "union[ \t]+"
; "\\([a-zA-Z0-9_]+\\)" ; this is the string we want to get
; "[ \t]*[{]"
; )) 3)
))
) 2)
;; Example of generic expression for finding prototypes, structs, unions, enums.
;; Uncomment if you want to find these too. It will be a bit slower gathering
;; the indexes.
; ("Prototypes"
; (,
; (concat
; "^" ; beginning of line is required
; "\\(template[ \t]*<[^>]+>[ \t]*\\)?" ; there may be a "template <...>"
; "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; type specs; there can be no
; "\\([a-zA-Z0-9_:]+[ \t]+\\)?" ; more than 3 tokens, right?
; "\\(" ; last type spec including */&
; "[a-zA-Z0-9_:]+"
; "\\([ \t]*[*&]+[ \t]*\\|[ \t]+\\)" ; either pointer/ref sign or whitespace
; "\\)?" ; if there is a last type spec
; "\\(" ; name; take that into the imenu entry