Mercurial > emacs
comparison lisp/ediff-init.el @ 89909:68c22ea6027c
Sync to HEAD
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 16 Apr 2004 12:51:06 +0000 |
| parents | 375f2633d815 |
| children | 0796fc36c2bd |
comparison
equal
deleted
inserted
replaced
| 89908:ee1402f7b568 | 89909:68c22ea6027c |
|---|---|
| 1 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff | 1 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff |
| 2 | 2 |
| 3 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02, 04 Free Software Foundation, Inc. |
| 4 | 4 |
| 5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | 6 |
| 7 ;; This file is part of GNU Emacs. | 7 ;; This file is part of GNU Emacs. |
| 8 | 8 |
| 893 (error | 893 (error |
| 894 (message "Pixmap not found for %S: %s" (face-name face) pixmap) | 894 (message "Pixmap not found for %S: %s" (face-name face) pixmap) |
| 895 (sit-for 1))))) | 895 (sit-for 1))))) |
| 896 | 896 |
| 897 (defun ediff-hide-face (face) | 897 (defun ediff-hide-face (face) |
| 898 (if (and (ediff-has-face-support-p) ediff-emacs-p) | 898 (if (and (ediff-has-face-support-p) (boundp 'add-to-list) |
| 899 (boundp 'facemenu-unlisted-faces)) | |
| 899 (add-to-list 'facemenu-unlisted-faces face))) | 900 (add-to-list 'facemenu-unlisted-faces face))) |
| 900 | 901 |
| 901 | 902 |
| 902 | 903 |
| 903 (defface ediff-current-diff-face-A | 904 (defface ediff-current-diff-face-A |
| 1286 | 1287 |
| 1287 | 1288 |
| 1288 ;;; Misc | 1289 ;;; Misc |
| 1289 | 1290 |
| 1290 ;; if nil, this silences some messages | 1291 ;; if nil, this silences some messages |
| 1291 (defconst ediff-verbose-p t) | 1292 (defvar ediff-verbose-p t) |
| 1292 | 1293 |
| 1293 (defcustom ediff-autostore-merges 'group-jobs-only | 1294 (defcustom ediff-autostore-merges 'group-jobs-only |
| 1294 "*Save the results of merge jobs automatically. | 1295 "*Save the results of merge jobs automatically. |
| 1295 nil means don't save automatically. t means always save. Anything else | 1296 nil means don't save automatically. t means always save. Anything else |
| 1296 means save automatically only if the merge job is part of a group of jobs, such | 1297 means save automatically only if the merge job is part of a group of jobs, such |
| 1760 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | 1761 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
| 1761 ;;; End: | 1762 ;;; End: |
| 1762 | 1763 |
| 1763 (provide 'ediff-init) | 1764 (provide 'ediff-init) |
| 1764 | 1765 |
| 1766 ;;; arch-tag: fa31d384-1e70-4d4b-82a7-3e96307c46f5 | |
| 1765 ;;; ediff-init.el ends here | 1767 ;;; ediff-init.el ends here |