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> 2001-11-27 Richard M. Stallman <rms@gnu.org>
* cus-edit.el (custom-load-symbol): Don't always load locate-library. * cus-edit.el (custom-load-symbol): Don't always load locate-library.
......
...@@ -223,20 +223,20 @@ This is a good function to put in `comint-output-filter-functions'." ...@@ -223,20 +223,20 @@ This is a good function to put in `comint-output-filter-functions'."
(eval-when-compile (eval-when-compile
;; We use this to preserve or protect things when modifying text ;; We use this to preserve or protect things when modifying text
;; properties. Stolen from lazy-lock and font-lock. Ugly!!! ;; properties. Stolen from lazy-lock and font-lock. Ugly!!!
;; Probably most of this is not needed? ;; Probably most of this is not needed?
(defmacro save-buffer-state (varlist &rest body) (defmacro save-buffer-state (varlist &rest body)
"Bind variables according to VARLIST and eval BODY restoring buffer state." "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) '((modified (buffer-modified-p)) (buffer-undo-list t)
(inhibit-read-only t) (inhibit-point-motion-hooks t) (inhibit-read-only t) (inhibit-point-motion-hooks t)
before-change-functions after-change-functions before-change-functions after-change-functions
deactivate-mark buffer-file-name buffer-file-truename)))) deactivate-mark buffer-file-name buffer-file-truename)))
(,@ body) ,@body
(when (and (not modified) (buffer-modified-p)) (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)) (put 'save-buffer-state 'lisp-indent-function 1))
(defun ansi-color-unfontify-region (beg end &rest xemacs-stuff) (defun ansi-color-unfontify-region (beg end &rest xemacs-stuff)
"Replacement function for `font-lock-default-unfontify-region'. "Replacement function for `font-lock-default-unfontify-region'.
......
...@@ -539,21 +539,20 @@ being set. This might change someday. ...@@ -539,21 +539,20 @@ being set. This might change someday.
Optional second arg INFO-NODE means this bookmark is at info node Optional second arg INFO-NODE means this bookmark is at info node
INFO-NODE, so record this fact in the bookmark's entry." INFO-NODE, so record this fact in the bookmark's entry."
(let ((the-record (let ((the-record
(` ((filename . (, (bookmark-buffer-file-name))) `((filename . ,(bookmark-buffer-file-name))
(front-context-string (front-context-string
. (, (if (>= (- (point-max) (point)) bookmark-search-size) . ,(if (>= (- (point-max) (point)) bookmark-search-size)
(buffer-substring-no-properties (buffer-substring-no-properties
(point) (point)
(+ (point) bookmark-search-size)) (+ (point) bookmark-search-size))
nil))) nil))
(rear-context-string (rear-context-string
. (, (if (>= (- (point) (point-min)) bookmark-search-size) . ,(if (>= (- (point) (point-min)) bookmark-search-size)
(buffer-substring-no-properties (buffer-substring-no-properties
(point) (point)
(- (point) bookmark-search-size)) (- (point) bookmark-search-size))
nil))) nil))
(position . (, (point))) (position . ,(point)))))
))))
;; Now fill in the optional parts: ;; Now fill in the optional parts:
...@@ -661,11 +660,11 @@ affect point." ...@@ -661,11 +660,11 @@ affect point."
(ann (nth 4 record))) (ann (nth 4 record)))
(list (list
name name
(` ((filename . (, filename)) `((filename . ,filename)
(front-context-string . (, (or front-str ""))) (front-context-string . ,(or front-str ""))
(rear-context-string . (, (or rear-str ""))) (rear-context-string . ,(or rear-str ""))
(position . (, position)) (position . ,position)
(annotation . (, ann))))))) (annotation . ,ann)))))
old-list)) old-list))
...@@ -1347,7 +1346,7 @@ for a file, defaulting to the file defined by variable ...@@ -1347,7 +1346,7 @@ for a file, defaulting to the file defined by variable
(set-buffer (let ((enable-local-variables nil)) (set-buffer (let ((enable-local-variables nil))
(find-file-noselect file))) (find-file-noselect file)))
(goto-char (point-min)) (goto-char (point-min))
(let ((print-length nil) (let ((print-length nil)
(print-level nil)) (print-level nil))
(delete-region (point-min) (point-max)) (delete-region (point-min) (point-max))
(bookmark-insert-file-format-version-stamp) (bookmark-insert-file-format-version-stamp)
......
...@@ -317,26 +317,26 @@ Subexpression 2 must end right before the \\n or \\r.") ...@@ -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'. ;; 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. ;; Return value is the number of files marked, or nil if none were marked.
(defmacro dired-mark-if (predicate msg) (defmacro dired-mark-if (predicate msg)
(` (let (buffer-read-only count) `(let (buffer-read-only count)
(save-excursion (save-excursion
(setq count 0) (setq count 0)
(if (, msg) (message "Marking %ss..." (, msg))) (if ,msg (message "Marking %ss..." ,msg))
(goto-char (point-min)) (goto-char (point-min))
(while (not (eobp)) (while (not (eobp))
(if (, predicate) (if ,predicate
(progn (progn
(delete-char 1) (delete-char 1)
(insert dired-marker-char) (insert dired-marker-char)
(setq count (1+ count)))) (setq count (1+ count))))
(forward-line 1)) (forward-line 1))
(if (, msg) (message "%s %s%s %s%s." (if ,msg (message "%s %s%s %s%s."
count count
(, msg) ,msg
(dired-plural-s count) (dired-plural-s count)
(if (eq dired-marker-char ?\040) "un" "") (if (eq dired-marker-char ?\040) "un" "")
(if (eq dired-marker-char dired-del-marker) (if (eq dired-marker-char dired-del-marker)
"flagged" "marked")))) "flagged" "marked"))))
(and (> count 0) count)))) (and (> count 0) count)))
(defmacro dired-map-over-marks (body arg &optional show-progress) (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. "Eval BODY with point on each marked line. Return a list of BODY's results.
......
This diff is collapsed.
...@@ -176,18 +176,18 @@ ...@@ -176,18 +176,18 @@
;; From custom web page for compatibility between versions of custom: ;; From custom web page for compatibility between versions of custom:
(eval-and-compile (eval-and-compile
(condition-case () (condition-case ()
(require 'custom) (require 'custom)
(error nil)) (error nil))
(if (and (featurep 'custom) (fboundp 'custom-declare-variable)) (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
nil ;; We've got what we needed nil ;; We've got what we needed
;; We have the old custom-library, hack around it! ;; We have the old custom-library, hack around it!
(defmacro defgroup (&rest args) (defmacro defgroup (&rest args)
nil) nil)
(defmacro custom-add-option (&rest args) (defmacro custom-add-option (&rest args)
nil) nil)
(defmacro defcustom (var value doc &rest args) (defmacro defcustom (var value doc &rest args)
(` (defvar (, var) (, value) (, doc)))))) `(defvar ,var ,value ,doc))))
(defcustom checkdoc-autofix-flag 'semiautomatic (defcustom checkdoc-autofix-flag 'semiautomatic
"*Non-nil means attempt auto-fixing of doc strings. "*Non-nil means attempt auto-fixing of doc strings.
......
...@@ -219,14 +219,14 @@ buffer will *not* have been changed. ...@@ -219,14 +219,14 @@ buffer will *not* have been changed.
Return value of last form in FORMS." Return value of last form in FORMS."
(let ((old-buffer (make-symbol "old-buffer")) (let ((old-buffer (make-symbol "old-buffer"))
(hnd (make-symbol "ewoc"))) (hnd (make-symbol "ewoc")))
(` (let* (((, old-buffer) (current-buffer)) `(let* ((,old-buffer (current-buffer))
((, hnd) (, ewoc)) (,hnd ,ewoc)
(dll (ewoc--dll (, hnd))) (dll (ewoc--dll ,hnd))
(,@ varlist)) ,@varlist)
(set-buffer (ewoc--buffer (, hnd))) (set-buffer (ewoc--buffer ,hnd))
(unwind-protect (unwind-protect
(progn (,@ forms)) (progn ,@forms)
(set-buffer (, old-buffer))))))) (set-buffer ,old-buffer)))))
(defmacro ewoc--set-buffer-bind-dll (ewoc &rest forms) (defmacro ewoc--set-buffer-bind-dll (ewoc &rest forms)
`(ewoc--set-buffer-bind-dll-let* ,ewoc nil ,@forms)) `(ewoc--set-buffer-bind-dll-let* ,ewoc nil ,@forms))
......
...@@ -57,12 +57,12 @@ ...@@ -57,12 +57,12 @@
(defmacro emerge-eval-in-buffer (buffer &rest forms) (defmacro emerge-eval-in-buffer (buffer &rest forms)
"Macro to switch to BUFFER, evaluate FORMS, returns to original buffer. "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." Differs from `save-excursion' in that it doesn't save the point and mark."
(` (let ((StartBuffer (current-buffer))) `(let ((StartBuffer (current-buffer)))
(unwind-protect (unwind-protect
(progn (progn
(set-buffer (, buffer)) (set-buffer ,buffer)
(,@ forms)) ,@forms)
(set-buffer StartBuffer))))) (set-buffer StartBuffer))))
(defmacro emerge-defvar-local (var value doc) (defmacro emerge-defvar-local (var value doc)
"Defines SYMBOL as an advertised variable. "Defines SYMBOL as an advertised variable.
...@@ -70,10 +70,10 @@ Performs a defvar, then executes `make-variable-buffer-local' on ...@@ -70,10 +70,10 @@ Performs a defvar, then executes `make-variable-buffer-local' on
the variable. Also sets the `preserved' property, so that the variable. Also sets the `preserved' property, so that
`kill-all-local-variables' (called by major-mode setting commands) `kill-all-local-variables' (called by major-mode setting commands)
won't destroy Emerge control variables." won't destroy Emerge control variables."
(` (progn `(progn
(defvar (, var) (, value) (, doc)) (defvar ,var ,value ,doc)
(make-variable-buffer-local '(, var)) (make-variable-buffer-local ',var)
(put '(, var) 'preserved t)))) (put ',var 'preserved t)))
;; Add entries to minor-mode-alist so that emerge modes show correctly ;; Add entries to minor-mode-alist so that emerge modes show correctly
(defvar emerge-minor-modes-list (defvar emerge-minor-modes-list
...@@ -567,7 +567,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -567,7 +567,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
;;; Setup functions for two-file mode. ;;; Setup functions for two-file mode.
(defun emerge-files-internal (file-A file-B &optional startup-hooks quit-hooks (defun emerge-files-internal (file-A file-B &optional startup-hooks quit-hooks
output-file) output-file)
(if (not (file-readable-p file-A)) (if (not (file-readable-p file-A))
(error "File `%s' does not exist or is not readable" file-A)) (error "File `%s' does not exist or is not readable" file-A))
(if (not (file-readable-p file-B)) (if (not (file-readable-p file-B))
...@@ -587,10 +587,10 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -587,10 +587,10 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp (if temp
(setq file-A temp (setq file-A temp
startup-hooks startup-hooks
(cons (` (lambda () (delete-file (, file-A)))) (cons `(lambda () (delete-file ,file-A))
startup-hooks)) startup-hooks))
;; Verify that the file matches the buffer ;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))) (emerge-verify-file-buffer))))
(emerge-eval-in-buffer (emerge-eval-in-buffer
buffer-B buffer-B
(widen) (widen)
...@@ -598,10 +598,10 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -598,10 +598,10 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp (if temp
(setq file-B temp (setq file-B temp
startup-hooks startup-hooks
(cons (` (lambda () (delete-file (, file-B)))) (cons `(lambda () (delete-file ,file-B))
startup-hooks)) startup-hooks))
;; Verify that the file matches the buffer ;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))) (emerge-verify-file-buffer))))
(emerge-setup buffer-A file-A buffer-B file-B startup-hooks quit-hooks (emerge-setup buffer-A file-A buffer-B file-B startup-hooks quit-hooks
output-file))) output-file)))
...@@ -741,10 +741,10 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -741,10 +741,10 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp (if temp
(setq file-A temp (setq file-A temp
startup-hooks startup-hooks
(cons (` (lambda () (delete-file (, file-A)))) (cons `(lambda () (delete-file ,file-A))
startup-hooks)) startup-hooks))
;; Verify that the file matches the buffer ;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))) (emerge-verify-file-buffer))))
(emerge-eval-in-buffer (emerge-eval-in-buffer
buffer-B buffer-B
(widen) (widen)
...@@ -752,10 +752,10 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -752,10 +752,10 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp (if temp
(setq file-B temp (setq file-B temp
startup-hooks startup-hooks
(cons (` (lambda () (delete-file (, file-B)))) (cons `(lambda () (delete-file ,file-B))
startup-hooks)) startup-hooks))
;; Verify that the file matches the buffer ;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))) (emerge-verify-file-buffer))))
(emerge-eval-in-buffer (emerge-eval-in-buffer
buffer-ancestor buffer-ancestor
(widen) (widen)
...@@ -763,10 +763,10 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -763,10 +763,10 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(if temp (if temp
(setq file-ancestor temp (setq file-ancestor temp
startup-hooks startup-hooks
(cons (` (lambda () (delete-file (, file-ancestor)))) (cons `(lambda () (delete-file ,file-ancestor))
startup-hooks)) startup-hooks))
;; Verify that the file matches the buffer ;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))) (emerge-verify-file-buffer))))
(emerge-setup-with-ancestor buffer-A file-A buffer-B file-B (emerge-setup-with-ancestor buffer-A file-A buffer-B file-B
buffer-ancestor file-ancestor buffer-ancestor file-ancestor
startup-hooks quit-hooks output-file))) startup-hooks quit-hooks output-file)))
...@@ -901,7 +901,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -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 (emerge-read-file-name "Output file" emerge-last-dir-output
f f nil))))) f f nil)))))
(if file-out (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 (emerge-files-internal
file-A file-B startup-hooks file-A file-B startup-hooks
quit-hooks quit-hooks
...@@ -923,7 +923,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -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 (emerge-read-file-name "Output file" emerge-last-dir-output
f f nil))))) f f nil)))))
(if file-out (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 (emerge-files-with-ancestor-internal
file-A file-B file-ancestor startup-hooks file-A file-B file-ancestor startup-hooks
quit-hooks quit-hooks
...@@ -951,17 +951,17 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -951,17 +951,17 @@ 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)) (write-region (point-min) (point-max) emerge-file-B nil 'no-message))
(emerge-setup (get-buffer buffer-A) emerge-file-A (emerge-setup (get-buffer buffer-A) emerge-file-A
(get-buffer buffer-B) emerge-file-B (get-buffer buffer-B) emerge-file-B
(cons (` (lambda () (cons `(lambda ()
(delete-file (, emerge-file-A)) (delete-file ,emerge-file-A)
(delete-file (, emerge-file-B)))) (delete-file ,emerge-file-B))
startup-hooks) startup-hooks)
quit-hooks quit-hooks
nil))) nil)))
;;;###autoload ;;;###autoload
(defun emerge-buffers-with-ancestor (buffer-A buffer-B buffer-ancestor (defun emerge-buffers-with-ancestor (buffer-A buffer-B buffer-ancestor
&optional startup-hooks &optional startup-hooks
quit-hooks) quit-hooks)
"Run Emerge on two buffers, giving another buffer as the ancestor." "Run Emerge on two buffers, giving another buffer as the ancestor."
(interactive (interactive
"bBuffer A to merge: \nbBuffer B to merge: \nbAncestor buffer: ") "bBuffer A to merge: \nbBuffer B to merge: \nbAncestor buffer: ")
...@@ -982,11 +982,11 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -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-B) emerge-file-B
(get-buffer buffer-ancestor) (get-buffer buffer-ancestor)
emerge-file-ancestor emerge-file-ancestor
(cons (` (lambda () (cons `(lambda ()
(delete-file (, emerge-file-A)) (delete-file ,emerge-file-A)
(delete-file (, emerge-file-B)) (delete-file ,emerge-file-B)
(delete-file (delete-file
(, emerge-file-ancestor)))) ,emerge-file-ancestor))
startup-hooks) startup-hooks)
quit-hooks quit-hooks
nil))) nil)))
...@@ -1001,7 +1001,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -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)) (setq command-line-args-left (nthcdr 3 command-line-args-left))
(emerge-files-internal (emerge-files-internal
file-a file-b nil file-a file-b nil
(list (` (lambda () (emerge-command-exit (, file-out)))))))) (list `(lambda () (emerge-command-exit ,file-out))))))
;;;###autoload ;;;###autoload
(defun emerge-files-with-ancestor-command () (defun emerge-files-with-ancestor-command ()
...@@ -1015,15 +1015,15 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -1015,15 +1015,15 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(setq file-anc (nth 1 command-line-args-left)) (setq file-anc (nth 1 command-line-args-left))
(setq file-out (nth 4 command-line-args-left)) (setq file-out (nth 4 command-line-args-left))
(setq command-line-args-left (nthcdr 5 command-line-args-left))) (setq command-line-args-left (nthcdr 5 command-line-args-left)))
;; arguments are "file-a file-b ancestor file-out" ;; arguments are "file-a file-b ancestor file-out"
(setq file-a (nth 0 command-line-args-left)) (setq file-a (nth 0 command-line-args-left))
(setq file-b (nth 1 command-line-args-left)) (setq file-b (nth 1 command-line-args-left))
(setq file-anc (nth 2 command-line-args-left)) (setq file-anc (nth 2 command-line-args-left))
(setq file-out (nth 3 command-line-args-left)) (setq file-out (nth 3 command-line-args-left))
(setq command-line-args-left (nthcdr 4 command-line-args-left))) (setq command-line-args-left (nthcdr 4 command-line-args-left)))
(emerge-files-with-ancestor-internal (emerge-files-with-ancestor-internal
file-a file-b file-anc nil 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) (defun emerge-command-exit (file-out)
(emerge-write-and-delete 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.") ...@@ -1036,7 +1036,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(setq emerge-file-out file-out) (setq emerge-file-out file-out)
(emerge-files-internal (emerge-files-internal
file-a file-b nil 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) file-out)
(throw 'client-wait nil)) (throw 'client-wait nil))
...@@ -1045,7 +1045,7 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -1045,7 +1045,7 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(setq emerge-file-out file-out) (setq emerge-file-out file-out)
(emerge-files-with-ancestor-internal (emerge-files-with-ancestor-internal
file-a file-b file-anc nil 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) file-out)
(throw 'client-wait nil)) (throw 'client-wait nil))
...@@ -1070,17 +1070,17 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -1070,17 +1070,17 @@ This is *not* a user option, since Emerge uses it for its own processing.")
(emerge-revisions-internal (emerge-revisions-internal
file revision-A revision-B startup-hooks file revision-A revision-B startup-hooks
(if arg (if arg
(cons (` (lambda () (cons `(lambda ()
(shell-command (shell-command
(, (format "%s %s" emerge-rcs-ci-program file))))) ,(format "%s %s" emerge-rcs-ci-program file)))
quit-hooks) quit-hooks)
quit-hooks))) quit-hooks)))
;;;###autoload ;;;###autoload
(defun emerge-revisions-with-ancestor (arg file revision-A (defun emerge-revisions-with-ancestor (arg file revision-A
revision-B ancestor revision-B ancestor
&optional &optional
startup-hooks quit-hooks) startup-hooks quit-hooks)
"Emerge two RCS revisions of a file, with another revision as ancestor." "Emerge two RCS revisions of a file, with another revision as ancestor."
(interactive (interactive
(list current-prefix-arg (list current-prefix-arg
...@@ -1095,14 +1095,14 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -1095,14 +1095,14 @@ This is *not* a user option, since Emerge uses it for its own processing.")
file revision-A revision-B ancestor startup-hooks file revision-A revision-B ancestor startup-hooks
(if arg (if arg
(let ((cmd )) (let ((cmd ))
(cons (` (lambda () (cons `(lambda ()
(shell-command (shell-command
(, (format "%s %s" emerge-rcs-ci-program file))))) ,(format "%s %s" emerge-rcs-ci-program file)))
quit-hooks)) quit-hooks))
quit-hooks))) quit-hooks)))
(defun emerge-revisions-internal (file revision-A revision-B &optional (defun emerge-revisions-internal (file revision-A revision-B &optional
startup-hooks quit-hooks output-file) startup-hooks quit-hooks output-file)
(let ((buffer-A (get-buffer-create (format "%s,%s" file revision-A))) (let ((buffer-A (get-buffer-create (format "%s,%s" file revision-A)))
(buffer-B (get-buffer-create (format "%s,%s" file revision-B))) (buffer-B (get-buffer-create (format "%s,%s" file revision-B)))
(emerge-file-A (emerge-make-temp-file "A")) (emerge-file-A (emerge-make-temp-file "A"))
...@@ -1127,18 +1127,18 @@ This is *not* a user option, since Emerge uses it for its own processing.") ...@@ -1127,18 +1127,18 @@ This is *not* a user option, since Emerge uses it for its own processing.")
;; Do the merge ;; Do the merge
(emerge-setup buffer-A emerge-file-A (emerge-setup buffer-A emerge-file-A
buffer-B emerge-file-B buffer-B emerge-file-B
(cons (` (lambda () (cons `(lambda ()
(delete-file (, emerge-file-A)) (delete-file ,emerge-file-A)
(delete-file (, emerge-file-B)))) (delete-file ,emerge-file-B))
startup-hooks) startup-hooks)
(cons (` (lambda () (emerge-files-exit (, file)))) (cons `(lambda () (emerge-files-exit ,file))