[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3ac94b9 06/23: Remove some XEmacs-specific code fro
From: |
Reuben Thomas |
Subject: |
[Emacs-diffs] master 3ac94b9 06/23: Remove some XEmacs-specific code from ispell.el |
Date: |
Tue, 13 Dec 2016 19:44:36 +0000 (UTC) |
branch: master
commit 3ac94b992c15cd4f45c470d6bd5a978d1bb9565f
Author: Reuben Thomas <address@hidden>
Commit: Reuben Thomas <address@hidden>
Remove some XEmacs-specific code from ispell.el
* lisp/textmodes/ispell.el: Remove XEmacs menubar setup.
(ispell-int-char): Remove.
---
lisp/textmodes/ispell.el | 69 ++++------------------------------------------
1 file changed, 6 insertions(+), 63 deletions(-)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 5ad7d05..5670bcd 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1466,62 +1466,6 @@ The variable `ispell-library-directory' defines their
location."
;;(put 'ispell-region 'menu-enable 'mark-active)
(fset 'ispell-menu-map (symbol-value 'ispell-menu-map))))
-;;; XEmacs versions 19 & 20
-(if (and (featurep 'xemacs)
- (featurep 'menubar)
- ;;(null ispell-menu-xemacs)
- (not (and (boundp 'infodock-version) infodock-version)))
- (let ((dicts (if (fboundp 'ispell-valid-dictionary-list)
- (reverse (ispell-valid-dictionary-list))))
- (current-menubar (or current-menubar default-menubar))
- (menu
- '(["Help" (describe-function 'ispell-help) t]
- ;;["Help" (popup-menu ispell-help-list) t]
- ["Check Message" ispell-message t]
- ["Check Buffer" ispell-buffer t]
- ["Check Comments" ispell-comments-and-strings t]
- ["Check Word" ispell-word t]
- ["Check Region" ispell-region (or (not zmacs-regions) (mark))]
- ["Continue Check" ispell-continue t]
- ["Complete Word Frag"ispell-complete-word-interior-frag t]
- ["Complete Word" ispell-complete-word t]
- ["Kill Process" (ispell-kill-ispell nil 'clear) t]
- ["Customize..." (customize-group 'ispell) t]
- ;; flyspell-mode may not be bound...
- ;;["flyspell" flyspell-mode
- ;; :style toggle :selected flyspell-mode ]
- "-"
- ["Save Personal Dict"(ispell-pdict-save t t) t]
- ["Change Dictionary" ispell-change-dictionary t])))
- (if (null dicts)
- (setq dicts (cons "default" nil)))
- (dolist (name dicts)
- (setq menu (append menu
- (list
- (vector
- (concat "Select " (capitalize name))
- (list 'ispell-change-dictionary name)
- t)))))
- (setq ispell-menu-xemacs menu)
- (if current-menubar
- (progn
- (if (car (find-menu-item current-menubar '("Cmds")))
- (progn
- ;; XEmacs 21.2
- (delete-menu-item '("Cmds" "Spell-Check"))
- (add-menu '("Cmds") "Spell-Check" ispell-menu-xemacs))
- ;; previous
- (delete-menu-item '("Edit" "Spell")) ; in case already defined
- (add-menu '("Edit") "Spell" ispell-menu-xemacs))))))
-
-(defalias 'ispell-int-char
- ;; Allow incrementing characters as integers in XEmacs 20
- (if (and (featurep 'xemacs)
- (fboundp 'int-char))
- 'int-char
- ;; Emacs and XEmacs 19 or earlier
- 'identity))
-
;;; **********************************************************************
@@ -2230,12 +2174,12 @@ Global `ispell-quit' set to start location to continue
spell session."
;; not so good if there are over 20 or 30 options, but then, if
;; there are that many you don't want to scan them all anyway...
(while (memq count command-characters) ; skip command characters.
- (setq count (ispell-int-char (1+ count))
+ (setq count (1+ count)
skipped (1+ skipped)))
(insert "(" count ") " (car choices) " ")
(setq choices (cdr choices)
- count (ispell-int-char (1+ count))))
- (setq count (ispell-int-char (- count ?0 skipped))))
+ count (1+ count)))
+ (setq count (- count ?0 skipped)))
(run-hooks 'ispell-update-post-hook)
@@ -2382,13 +2326,12 @@ Global `ispell-quit' set to start location to continue
spell session."
(window-width))
(insert "\n"))
(while (memq count command-characters)
- (setq count (ispell-int-char (1+ count))
+ (setq count (1+ count)
skipped (1+ skipped)))
(insert "(" count ") " (car choices) " ")
(setq choices (cdr choices)
- count (ispell-int-char (1+ count))))
- (setq count (ispell-int-char
- (- count ?0 skipped))))
+ count (1+ count)))
+ (setq count (- count ?0 skipped)))
(setq textwin (selected-window))
(ispell-show-choices)
(select-window textwin))))
- [Emacs-diffs] master updated (aacb20c -> 9e6618b), Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 3ac94b9 06/23: Remove some XEmacs-specific code from ispell.el,
Reuben Thomas <=
- [Emacs-diffs] master 8edf0eb 02/23: Assume we have version<= for checking ispell version, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 854ed8a 07/23: Assume Emacs supports [:alpha:] in regexps, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master e1aa788 18/23: Remove boundp test for always-bound symbol, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 6e88249 12/23: Remove XEmacs-specific horizontal scrollbar handling in ispell.el, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 8315d50 15/23: Remove support for old versions of supercite and GNUS from ispell.el, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 51d011d 04/23: Remove tests for built-in functions, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 8af9cb2 19/23: Remove meaningless defconst ispell-version, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 3affed0 16/23: Remove unused constant, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master 8245e5b 11/23: Remove XEmacs-specific code dealing with enable-multibyte-characters, Reuben Thomas, 2016/12/13
- [Emacs-diffs] master ff5dedd 10/23: Remove XEmacs-specific code from ispell.el, Reuben Thomas, 2016/12/13