Mercurial > emacs
view lisp/diff.el @ 80756:76e75acf7e4e
Fix typos (sync from the trunk).
* facemenu.el (facemenu-unlisted-faces): Fix obsolescence declaration.
* hi-lock.el (hi-lock-mode): Fix typo in docstring.
* icomplete.el (icomplete-compute-delay, icomplete-get-keys): Doc fixes.
(icomplete-delay-completions-threshold): Fix typo in docstring.
* speedbar.el (speedbar-stealthy-function-list)
(speedbar-verbosity-level, speedbar-supported-extension-expressions)
(speedbar-update-current-file, speedbar-add-indicator)
(speedbar-tag-expand): Reflow docstrings.
(speedbar-use-imenu-flag, speedbar-use-tool-tips-flag)
(speedbar-ignored-directory-regexp, speedbar-file-unshown-regexp)
(speedbar-file-regexp, speedbar-message, speedbar-item-info)
(speedbar-files-item-info, speedbar-fetch-replacement-function)
(speedbar-maybe-add-localized-support)
(speedbar-generic-list-positioned-group-p, speedbar-insert-generic-list)
(speedbar-extract-one-symbol, speedbar-recenter-to-top)
(speedbar-recenter, speedbar-separator-face): Fix typos in docstrings.
(speedbar-ignored-directory-expressions, speedbar-handle-delete-frame)
(speedbar-show-info-under-mouse, speedbar-directory-buttons)
(speedbar-check-vc-this-line, speedbar-files-line-directory)
(speedbar-buffer-buttons, speedbar-buffer-buttons-temp)
(speedbar-buffers-line-directory): Doc fixes.
* tool-bar.el (tool-bar-add-item): Fix typo in docstring.
* emacs-lisp/edebug.el (edebug-unwrap*, edebug-signal)
(edebug-restore-status): Doc fixes.
(edebug-gensym, edebug-top-level-nonstop, edebug-eval-display)
(edebug-eval-result-list, edebug-eval-redisplay, edebug)
(edebug-trace): Fix typos in docstrings.
* emulation/tpu-edt.el (tpu-match-beginning, tpu-match-end)
(tpu-check-match, tpu-goto-breadcrumb, tpu-reset-screen-size)
(tpu-toggle-overwrite-mode, tpu-include, tpu-get, tpu-what-line)
(tpu-insert-escape, tpu-insert-formfeed, tpu-end-define-macro-key)
(tpu-check-search-case, tpu-select, tpu-unselect, tpu-trim-line-ends)
(tpu-toggle-control-keys): Fix typos in docstrings.
(tpu-kill-buffer): Doc fix.
(tpu-make-file-buffer-list, tpu-toggle-regexp, tpu-cut)
(tpu-append-region, tpu-delete-current-char, tpu-emacs-replace):
Reflow docstrings.
* eshell/em-smart.el (eshell-review-quick-commands): Doc fix.
* eshell/esh-arg.el (eshell-quote-backslash): Fix typo in docstring.
* play/solitaire.el (solitaire, solitaire-mode-map, solitaire-mode-hook)
(solitaire-mode, solitaire, solitaire-solve): Fix typos in docstrings.
* progmodes/gdb-ui.el (gdb-source-info): Fix typo in docstring.
* progmodes/python.el (python-comment-line-p, python-blank-line-p)
(python-skip-out): Doc fixes.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Tue, 26 Aug 2008 11:02:51 +0000 |
parents | 73661ddc7ac7 |
children | 107ccd98fa12 |
line wrap: on
line source
;;; diff.el --- run `diff' in compilation-mode ;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 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 3, 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 only if 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)) (let ((inhibit-read-only t)) (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)) (let ((inhibit-read-only t)) (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) (let ((inhibit-read-only t)) (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-filter proc 'diff-process-filter) (set-process-sentinel proc (lambda (proc msg) (with-current-buffer (process-buffer proc) (diff-sentinel (process-exit-status proc)))))) ;; Async processes aren't available. (let ((inhibit-read-only t)) (diff-sentinel (call-process shell-file-name nil buf nil shell-command-switch command))))) buf)) (defun diff-process-filter (proc string) (with-current-buffer (process-buffer proc) (let ((moving (= (point) (process-mark proc)))) (save-excursion ;; Insert the text, advancing the process marker. (goto-char (process-mark proc)) (let ((inhibit-read-only t)) (insert string)) (set-marker (process-mark proc) (point))) (if moving (goto-char (process-mark proc)))))) ;;;###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