aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2021-11-17 06:25:50 +0100
committerStefan Kangas2021-11-17 06:25:50 +0100
commit9e79575486fb6aeb0deb23e17cb2ce9ec02b5fd7 (patch)
tree3559b6c35d5239dd08a32e985e170513cde9e1d6
parent3be2a6b8b4098e5cf118d196e4cba37054d8292b (diff)
downloademacs-9e79575486fb6aeb0deb23e17cb2ce9ec02b5fd7.tar.gz
emacs-9e79575486fb6aeb0deb23e17cb2ce9ec02b5fd7.zip
Remove some references to XEmacs
* lisp/emulation/viper-cmd.el (viper-start-R-mode): * lisp/emulation/viper-init.el (viper-window-display-p): * lisp/emulation/viper-mous.el (viper-surrounding-word): * lisp/mail/footnote.el (footnote-mode): * lisp/textmodes/reftex-index.el: Remove some comments referring to XEmacs.
-rw-r--r--lisp/emulation/viper-cmd.el1
-rw-r--r--lisp/emulation/viper-init.el1
-rw-r--r--lisp/emulation/viper-mous.el3
-rw-r--r--lisp/mail/footnote.el2
-rw-r--r--lisp/textmodes/reftex-index.el2
5 files changed, 2 insertions, 7 deletions
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 59be3f48462..849ad3d8241 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -2311,7 +2311,6 @@ problems."
2311 (viper-downgrade-to-insert)) 2311 (viper-downgrade-to-insert))
2312 2312
2313(defun viper-start-R-mode () 2313(defun viper-start-R-mode ()
2314 ;; Leave arg as 1, not t: XEmacs insists that it must be a pos number
2315 (overwrite-mode 1) 2314 (overwrite-mode 1)
2316 (add-hook 2315 (add-hook
2317 'viper-post-command-hooks #'viper-R-state-post-command-sentinel t 'local) 2316 'viper-post-command-hooks #'viper-R-state-post-command-sentinel t 'local)
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index e3790b74534..368a5dc40a6 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -44,7 +44,6 @@
44 44
45(define-obsolete-function-alias 'viper-device-type #'window-system "27.1") 45(define-obsolete-function-alias 'viper-device-type #'window-system "27.1")
46 46
47;; in XEmacs: device-type is tty on tty and stream in batch.
48(defun viper-window-display-p () 47(defun viper-window-display-p ()
49 (and window-system (not (memq window-system '(tty stream pc))))) 48 (and window-system (not (memq window-system '(tty stream pc)))))
50 49
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 3d55690bd6f..879d8edca6f 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -198,8 +198,7 @@ is ignored."
198 198
199 (setq result (buffer-substring word-beg (point)))) 199 (setq result (buffer-substring word-beg (point))))
200 ) ; if 200 ) ; if
201 ;; XEmacs doesn't have set-text-properties, but there buffer-substring 201 ;; FIXME: Use `buffer-substring-no-properties' above instead?
202 ;; doesn't return properties together with the string, so it's not needed.
203 (set-text-properties 0 (length result) nil result) 202 (set-text-properties 0 (length result) nil result)
204 result)) 203 result))
205 204
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 716348a9c19..ef040ca90b3 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -898,7 +898,7 @@ play around with the following keys:
898 (make-local-variable 'footnote-end-tag) 898 (make-local-variable 'footnote-end-tag)
899 (make-local-variable 'adaptive-fill-function) 899 (make-local-variable 'adaptive-fill-function)
900 900
901 ;; Filladapt was an XEmacs package which is now in GNU ELPA. 901 ;; Filladapt is a GNU ELPA package.
902 (when (boundp 'filladapt-token-table) 902 (when (boundp 'filladapt-token-table)
903 ;; add tokens to filladapt to match footnotes 903 ;; add tokens to filladapt to match footnotes
904 ;; 1] xxxxxxxxxxx x x x or [1] x x x x x x x 904 ;; 1] xxxxxxxxxxx x x x or [1] x x x x x x x
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 9d9eab4d7b5..357f7da2f9d 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -29,9 +29,7 @@
29 29
30(require 'reftex) 30(require 'reftex)
31 31
32;; START remove for XEmacs release
33(defvar TeX-master) 32(defvar TeX-master)
34;; END remove for XEmacs release
35 33
36;;;###autoload 34;;;###autoload
37(defun reftex-index-selection-or-word (&optional arg phrase) 35(defun reftex-index-selection-or-word (&optional arg phrase)