Mercurial > emacs
comparison lisp/vc.el @ 85972:51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Fri, 09 Nov 2007 05:20:57 +0000 |
parents | b627bc69db6a |
children | 613df1ba1584 |
comparison
equal
deleted
inserted
replaced
85971:2e692f327278 | 85972:51aa47312c4b |
---|---|
1928 ;; Treat this case specially so as not to pop the buffer. | 1928 ;; Treat this case specially so as not to pop the buffer. |
1929 (progn | 1929 (progn |
1930 (message "No changes between %s and %s" rev1-name rev2-name) | 1930 (message "No changes between %s and %s" rev1-name rev2-name) |
1931 nil) | 1931 nil) |
1932 (pop-to-buffer (current-buffer)) | 1932 (pop-to-buffer (current-buffer)) |
1933 ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's | 1933 (diff-mode) |
1934 ;; not available. Work around that. | |
1935 (if (require 'diff-mode nil t) (diff-mode)) | |
1936 (vc-exec-after `(vc-diff-sentinel ,verbose ,rev1-name ,rev2-name)) | 1934 (vc-exec-after `(vc-diff-sentinel ,verbose ,rev1-name ,rev2-name)) |
1937 ;; In the async case, we return t even if there are no differences | 1935 ;; In the async case, we return t even if there are no differences |
1938 ;; because we don't know that yet. | 1936 ;; because we don't know that yet. |
1939 t))) | 1937 t))) |
1940 | 1938 |