view lisp/diff.el @ 54754:fe0b01c2265f

(Info-history): Doc fix. (Info-history-list): New var. (info-xref): Change magenta4 to blue, remove bold for dark and light backgrounds, change bold to underline for non-color classes. (info-xref-visited): New face. (Info-fontify-visited-nodes): New custom. (Info-hide-note-references): Add new value `hide'. Doc fix. (Info-reference-name): New var. (Info-selection-hook): New custom. (Info-edit-mode-hook): New var. (Info-find-file): New fun. (Info-find-node): Move part of code to Info-find-file. (Info-find-node-2): Add anchors to Info-history-list. Move point to the place with the reference name if name is defined. (Info-select-node): Add current node to Info-history-list. (Info-goto-node): Switch to *info* from *info-history* *info-toc*. (Info-search-whitespace-regexp): New custom. (Info-search-case-fold): New var. (Info-search): Add "case-sensitively" to the prompt. Use Info-search-whitespace-regexp. Set Info-search-case-fold. (Info-search-case-sensitively, Info-search-next): New fun. (Info-up): Move point to the menu item of the current node. (Info-history): New fun. Add *info-history* to same-window-buffer-names. (Info-toc): New fun. Add *info-toc* to same-window-buffer-names. (Info-insert-toc): New fun. (Info-build-toc): New fun. (Info-follow-reference): Add new arg `fork'. Doc fix. Replace [ \n\t]* by [ \n\t]+ in the *Note regexp. For references with the same name prefer the reference closest to point. (Info-next-reference): Replace * by + in the *Note regexp. Add regexp for http:// and ftp://. Skip the *Note prefix. (Info-prev-reference): Replace * by + in the *Note regexp. Add regexp for http:// and ftp://. Skip the *Note prefix. (Info-follow-nearest-node): Add new arg `fork'. (Info-try-follow-nearest-node): Add new arg `fork'. Call browse-url for http:// and ftp:// references. Set Info-reference-name for index entries. (Info-mode-menu): Add menu items for Info-search-case-sensitively, Info-search-next, Info-history, Info-toc, clone-buffer. (Info-menu-update): Replace * by + in the *Note regexp. (Info-mode): Add documentation for Info-history, Info-toc, Info-search-case-sensitively, Info-search-next, clone-buffer. (Info-fontify-menu-headers): Remove fun. Move code to Info-fontify-node. (Info-fontify-node): Add docstring. Add local vars fontify-visited-p and not-fontified-p. If not-fontified-p is t then fontify header line, titles, menu headers, http and ftp references, refill paragraphs. If not-fontified-p is t or fontify-visited-p is t then fontify cross references, menu items. Fontify menu headers. Fontify http and ftp references. Change regexp for cross references to require whitespace after *Note, add matching groups for file and node names. Remove hack for quote. Use display property for Info-hide-note-references=t. Use fifth or fourth match for help-echo. Display visited nodes in a different face. Unhide file names of external references. Unhide newlines. Display visited menu items in a different face.

;;; diff.el --- run `diff' in compilation-mode

;; Copyright (C) 1992, 1994, 1996, 2001, 2004 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., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, 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 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*"))
	 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)
      (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