diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-03-05 04:09:24 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-03-05 04:09:24 +0000 |
| commit | 388059876ac4a5aa55149e0544f58118742c5020 (patch) | |
| tree | 1998506c19d7e9d9f6f8b513dc1e3566fcc1397d /lisp/ediff-init.el | |
| parent | 3405b0dfde50d1f5e5983b84cbd5ead7490c7fd1 (diff) | |
| download | emacs-388059876ac4a5aa55149e0544f58118742c5020.tar.gz emacs-388059876ac4a5aa55149e0544f58118742c5020.tar.bz2 emacs-388059876ac4a5aa55149e0544f58118742c5020.zip | |
* bindings.el (mode-line-remote): Add mouse-face. Improve tooltip.
(standard-mode-line-position): Add mouse-face.
* progmodes/compile.el (compilation-menu-map):
(compilation-mode-map):
* progmodes/grep.el (grep-mode-map): Add :help.
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-map): Define and
initialize in one step. Add :help. Use :enable to activate menu
items. Show the key binding for edebug-defun.
(lisp-interaction-mode-map): Add a menu.
* term.el (term-mode-map): Define and initialize in one step.
* ediff-init.el (ediff-color-display-p): Simplify.
(Xor): Remove unused function.
(ediff-with-syntax-table): Simplify for emacs.
* ediff-hook.el (menu-bar-ediff-menu): Don't depend on the
menu-bar being loaded, it always is.
Diffstat (limited to 'lisp/ediff-init.el')
| -rw-r--r-- | lisp/ediff-init.el | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index b2e9571bcb6..2bf50f629c7 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -795,12 +795,9 @@ to temp files when Ediff needs to find fine differences." (defun ediff-color-display-p () (condition-case nil - (ediff-cond-compile-for-xemacs-or-emacs - (eq (device-class (selected-device)) 'color) ; xemacs form - (if (fboundp 'display-color-p) ; emacs form - (display-color-p) - (x-display-color-p)) - ) + (if (featurep 'xemacs) + (eq (device-class (selected-device)) 'color) ; xemacs form + (display-color-p)) ; emacs form (error nil))) @@ -1822,9 +1819,6 @@ Unless optional argument INPLACE is non-nil, return a new string." "Don't skip difference regions." nil) -(defsubst Xor (a b) - (or (and a (not b)) (and (not a) b))) - (defsubst ediff-message-if-verbose (string &rest args) (if ediff-verbose-p (apply 'message string args))) @@ -1846,22 +1840,23 @@ Unless optional argument INPLACE is non-nil, return a new string." (convert-standard-filename fname) fname)) - -(if (fboundp 'with-syntax-table) +(if (featurep 'emacs) (defalias 'ediff-with-syntax-table 'with-syntax-table) - ;; stolen from subr.el in emacs 21 - (defmacro ediff-with-syntax-table (table &rest body) - (let ((old-table (make-symbol "table")) - (old-buffer (make-symbol "buffer"))) - `(let ((,old-table (syntax-table)) - (,old-buffer (current-buffer))) - (unwind-protect - (progn - (set-syntax-table (copy-syntax-table ,table)) - ,@body) - (save-current-buffer - (set-buffer ,old-buffer) - (set-syntax-table ,old-table))))))) + (if (fboundp 'with-syntax-table) + (defalias 'ediff-with-syntax-table 'with-syntax-table) + ;; stolen from subr.el in emacs 21 + (defmacro ediff-with-syntax-table (table &rest body) + (let ((old-table (make-symbol "table")) + (old-buffer (make-symbol "buffer"))) + `(let ((,old-table (syntax-table)) + (,old-buffer (current-buffer))) + (unwind-protect + (progn + (set-syntax-table (copy-syntax-table ,table)) + ,@body) + (save-current-buffer + (set-buffer ,old-buffer) + (set-syntax-table ,old-table)))))))) (provide 'ediff-init) |