mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-19 10:22:27 +00:00
5b76833fd5
* woman.el (woman-file-name): * wid-edit.el (widget-file-prompt-value) (widget-coding-system-prompt-value): * w32-fns.el (set-w32-system-coding-system): * vc.el (vc-version-diff, vc-annotate): * textmodes/reftex-auc.el (reftex-arg-cite) (reftex-arg-index-tag): * textmodes/refer.el (refer-get-bib-files): * textmodes/artist.el (artist-figlet-choose-font): * terminal.el (terminal-emulator): * replace.el (occur-read-primary-args): * rect.el (string-rectangle, string-insert-rectangle): * ps-print.el (ps-print-preprint): * progmodes/pascal.el (pascal-goto-defun): * progmodes/etags.el (visit-tags-table, visit-tags-table-buffer): * progmodes/compile.el (compilation-find-file): * printing.el (pr-interactive-n-up): * play/animate.el (animate-birthday-present): * net/rcompile.el (remote-compile): * man.el (man, Man-goto-section, Man-follow-manual-reference): * mail/rmailsum.el (rmail-summary-search-backward) (rmail-summary-search): * mail/rmailout.el (rmail-output-read-rmail-file-name) (rmail-output-read-file-name): * mail/rmail.el (rmail-search, rmail-search-backwards): * mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs): * locate.el (locate): * international/quail.el (quail-show-keyboard-layout): * international/mule.el (set-buffer-file-coding-system) (revert-buffer-with-coding-system, set-file-name-coding-system) (set-terminal-coding-system, set-keyboard-coding-system) (set-next-selection-coding-system): * international/mule-diag.el (describe-coding-system) (describe-font, describe-fontset): * international/mule-cmds.el (universal-coding-system-argument) (search-unencodable-char, describe-input-method) (set-language-environment, describe-language-environment): * international/codepage.el (codepage-setup): * international/code-pages.el (codepage-setup): * info.el (Info-search, Info-follow-reference) (Info-search-backward): * emacs-lisp/advice.el (ad-read-advised-function) (ad-read-advice-class, ad-clear-cache, ad-activate) (ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name) (ad-enable-advice, ad-disable-advice, ad-remove-advice) (ad-read-regexp): * ediff-util.el (ediff-toggle-regexp-match): * ediff-ptch.el (ediff-prompt-for-patch-file): * dired-aux.el (dired-diff): * diff.el (diff): * cus-edit.el (custom-variable-prompt): * calendar/timeclock.el (timeclock-ask-for-project): * calc/calcalg3.el (calc-get-fit-variables): * calc/calc-store.el (calc-edit-variable) (calc-permanent-variable): * vc-mcvs.el (vc-mcvs-register): * shadowfile.el (shadow-define-literal-group): * woman.el (woman-file-name): * vc.el (vc-version-diff, vc-merge): * textmodes/reftex-index.el (reftex-index-complete-tag): * format.el (format-decode-buffer, format-decode-region): * emulation/viper-cmd.el (viper-read-string-with-history): * emacs-lisp/debug.el (cancel-debug-on-entry): * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): * ediff.el (ediff-merge-revisions) (ediff-merge-revisions-with-ancestor, ediff-revision): * completion.el (interactive-completion-string-reader): * calc/calc-prog.el (calc-user-define-formula): Follow convention for reading with the minibuffer.
175 lines
6.0 KiB
EmacsLisp
175 lines
6.0 KiB
EmacsLisp
;;; diff.el --- run `diff' in compilation-mode
|
|
|
|
;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004,
|
|
;; 2005 Free Software Foundation, Inc.
|
|
|
|
;; Maintainer: FSF
|
|
;; Keywords: unix, tools
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
;; any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
;; Boston, MA 02110-1301, USA.
|
|
|
|
;;; Commentary:
|
|
|
|
;; This package helps you explore differences between files, using the
|
|
;; UNIX command diff(1). The commands are `diff' and `diff-backup'.
|
|
;; You can specify options with `diff-switches'.
|
|
|
|
;;; Code:
|
|
|
|
(defgroup diff nil
|
|
"Comparing files with `diff'."
|
|
:group 'tools)
|
|
|
|
;;;###autoload
|
|
(defcustom diff-switches "-c"
|
|
"*A string or list of strings specifying switches to be passed to diff."
|
|
:type '(choice string (repeat string))
|
|
:group 'diff)
|
|
|
|
;;;###autoload
|
|
(defcustom diff-command "diff"
|
|
"*The command to use to run diff."
|
|
:type 'string
|
|
:group 'diff)
|
|
|
|
(defvar diff-old-temp-file nil
|
|
"This is the name of a temp file to be deleted after diff finishes.")
|
|
(defvar diff-new-temp-file nil
|
|
"This is the name of a temp file to be deleted after diff finishes.")
|
|
|
|
;; prompt if prefix arg present
|
|
(defun diff-switches ()
|
|
(if current-prefix-arg
|
|
(read-string "Diff switches: "
|
|
(if (stringp diff-switches)
|
|
diff-switches
|
|
(mapconcat 'identity diff-switches " ")))))
|
|
|
|
(defun diff-sentinel (code)
|
|
"Code run when the diff process exits.
|
|
CODE is the exit code of the process. It should be 0 iff no diffs were found."
|
|
(if diff-old-temp-file (delete-file diff-old-temp-file))
|
|
(if diff-new-temp-file (delete-file diff-new-temp-file))
|
|
(save-excursion
|
|
(goto-char (point-max))
|
|
(insert (format "\nDiff finished%s. %s\n"
|
|
(if (equal 0 code) " (no differences)" "")
|
|
(current-time-string)))))
|
|
|
|
;;;###autoload
|
|
(defun diff (old new &optional switches no-async)
|
|
"Find and display the differences between OLD and NEW files.
|
|
Interactively the current buffer's file name is the default for NEW
|
|
and a backup file for NEW is the default for OLD.
|
|
If NO-ASYNC is non-nil, call diff synchronously.
|
|
With prefix arg, prompt for diff switches."
|
|
(interactive
|
|
(let (oldf newf)
|
|
(setq newf (buffer-file-name)
|
|
newf (if (and newf (file-exists-p newf))
|
|
(read-file-name
|
|
(concat "Diff new file (default "
|
|
(file-name-nondirectory newf) "): ")
|
|
nil newf t)
|
|
(read-file-name "Diff new file: " nil nil t)))
|
|
(setq oldf (file-newest-backup newf)
|
|
oldf (if (and oldf (file-exists-p oldf))
|
|
(read-file-name
|
|
(concat "Diff original file (default "
|
|
(file-name-nondirectory oldf) "): ")
|
|
(file-name-directory oldf) oldf t)
|
|
(read-file-name "Diff original file: "
|
|
(file-name-directory newf) nil t)))
|
|
(list oldf newf (diff-switches))))
|
|
(setq new (expand-file-name new)
|
|
old (expand-file-name old))
|
|
(or switches (setq switches diff-switches)) ; If not specified, use default.
|
|
(let* ((old-alt (file-local-copy old))
|
|
(new-alt (file-local-copy new))
|
|
(command
|
|
(mapconcat 'identity
|
|
`(,diff-command
|
|
;; Use explicitly specified switches
|
|
,@(if (listp switches) switches (list switches))
|
|
,@(if (or old-alt new-alt)
|
|
(list "-L" old "-L" new))
|
|
,(shell-quote-argument (or old-alt old))
|
|
,(shell-quote-argument (or new-alt new)))
|
|
" "))
|
|
(buf (get-buffer-create "*Diff*"))
|
|
(thisdir default-directory)
|
|
proc)
|
|
(save-excursion
|
|
(display-buffer buf)
|
|
(set-buffer buf)
|
|
(setq buffer-read-only nil)
|
|
(buffer-disable-undo (current-buffer))
|
|
(erase-buffer)
|
|
(buffer-enable-undo (current-buffer))
|
|
(diff-mode)
|
|
(set (make-local-variable 'revert-buffer-function)
|
|
`(lambda (ignore-auto noconfirm)
|
|
(diff ',old ',new ',switches ',no-async)))
|
|
(set (make-local-variable 'diff-old-temp-file) old-alt)
|
|
(set (make-local-variable 'diff-new-temp-file) new-alt)
|
|
(setq default-directory thisdir)
|
|
(insert command "\n")
|
|
(if (and (not no-async) (fboundp 'start-process))
|
|
(progn
|
|
(setq proc (start-process "Diff" buf shell-file-name
|
|
shell-command-switch command))
|
|
(set-process-sentinel
|
|
proc (lambda (proc msg)
|
|
(with-current-buffer (process-buffer proc)
|
|
(diff-sentinel (process-exit-status proc))))))
|
|
;; Async processes aren't available.
|
|
(diff-sentinel
|
|
(call-process shell-file-name nil buf nil
|
|
shell-command-switch command))))
|
|
buf))
|
|
|
|
;;;###autoload
|
|
(defun diff-backup (file &optional switches)
|
|
"Diff this file with its backup file or vice versa.
|
|
Uses the latest backup, if there are several numerical backups.
|
|
If this file is a backup, diff it with its original.
|
|
The backup file is the first file given to `diff'.
|
|
With prefix arg, prompt for diff switches."
|
|
(interactive (list (read-file-name "Diff (file with backup): ")
|
|
(diff-switches)))
|
|
(let (bak ori)
|
|
(if (backup-file-name-p file)
|
|
(setq bak file
|
|
ori (file-name-sans-versions file))
|
|
(setq bak (or (diff-latest-backup-file file)
|
|
(error "No backup found for %s" file))
|
|
ori file))
|
|
(diff bak ori switches)))
|
|
|
|
(defun diff-latest-backup-file (fn) ; actually belongs into files.el
|
|
"Return the latest existing backup of FILE, or nil."
|
|
(let ((handler (find-file-name-handler fn 'diff-latest-backup-file)))
|
|
(if handler
|
|
(funcall handler 'diff-latest-backup-file fn)
|
|
(file-newest-backup fn))))
|
|
|
|
(provide 'diff)
|
|
|
|
;;; arch-tag: 7de2c29b-7ea5-4b85-9b9d-72dd860de2bd
|
|
;;; diff.el ends here
|