Mercurial > emacs
comparison lisp/emulation/viper-ex.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 | d505125b0b46 |
children | a168399ff2dc 880960b70474 |
comparison
equal
deleted
inserted
replaced
85971:2e692f327278 | 85972:51aa47312c4b |
---|---|
1101 (minibuffer-local-completion-map | 1101 (minibuffer-local-completion-map |
1102 (copy-keymap minibuffer-local-completion-map)) | 1102 (copy-keymap minibuffer-local-completion-map)) |
1103 beg end cont val) | 1103 beg end cont val) |
1104 | 1104 |
1105 (viper-add-keymap ex-read-filename-map | 1105 (viper-add-keymap ex-read-filename-map |
1106 (if viper-emacs-p | 1106 (if (featurep 'emacs) |
1107 minibuffer-local-completion-map | 1107 minibuffer-local-completion-map |
1108 read-file-name-map)) | 1108 read-file-name-map)) |
1109 | 1109 |
1110 (setq cont (setq viper-keep-reading-filename t)) | 1110 (setq cont (setq viper-keep-reading-filename t)) |
1111 (while cont | 1111 (while cont |
1556 (if skip-rest | 1556 (if skip-rest |
1557 () | 1557 () |
1558 ;; setup buffer | 1558 ;; setup buffer |
1559 (if (setq wind (viper-get-visible-buffer-window buf)) | 1559 (if (setq wind (viper-get-visible-buffer-window buf)) |
1560 () | 1560 () |
1561 (setq wind (get-lru-window (if viper-xemacs-p nil 'visible))) | 1561 (setq wind (get-lru-window (if (featurep 'xemacs) nil 'visible))) |
1562 (set-window-buffer wind buf)) | 1562 (set-window-buffer wind buf)) |
1563 | 1563 |
1564 (if (viper-window-display-p) | 1564 (if (viper-window-display-p) |
1565 (progn | 1565 (progn |
1566 (raise-frame (window-frame wind)) | 1566 (raise-frame (window-frame wind)) |
1876 ;; Viper help. Invokes Info | 1876 ;; Viper help. Invokes Info |
1877 (defun ex-help () | 1877 (defun ex-help () |
1878 (condition-case nil | 1878 (condition-case nil |
1879 (progn | 1879 (progn |
1880 (pop-to-buffer (get-buffer-create "*info*")) | 1880 (pop-to-buffer (get-buffer-create "*info*")) |
1881 (info (if viper-xemacs-p "viper.info" "viper")) | 1881 (info (if (featurep 'xemacs) "viper.info" "viper")) |
1882 (message "Type `i' to search for a specific topic")) | 1882 (message "Type `i' to search for a specific topic")) |
1883 (error (beep 1) | 1883 (error (beep 1) |
1884 (with-output-to-temp-buffer " *viper-info*" | 1884 (with-output-to-temp-buffer " *viper-info*" |
1885 (princ (format " | 1885 (princ (format " |
1886 The Info file for Viper does not seem to be installed. | 1886 The Info file for Viper does not seem to be installed. |
1887 | 1887 |
1888 This file is part of the standard distribution of %sEmacs. | 1888 This file is part of the standard distribution of %sEmacs. |
1889 Please contact your system administrator. " | 1889 Please contact your system administrator. " |
1890 (if viper-xemacs-p "X" "") | 1890 (if (featurep 'xemacs) "X" "") |
1891 )))))) | 1891 )))))) |
1892 | 1892 |
1893 ;; Ex source command. Loads the file specified as argument or `~/.viper' | 1893 ;; Ex source command. Loads the file specified as argument or `~/.viper' |
1894 (defun ex-source () | 1894 (defun ex-source () |
1895 (viper-get-ex-file) | 1895 (viper-get-ex-file) |