Mercurial > emacs
annotate lisp/textmodes/spell.el @ 1717:aa7d6d57504b
* frame.h (struct frame): New fields `can_have_scrollbars' and
`has_vertical_scrollbars'.
(FRAME_CAN_HAVE_SCROLLBARS, FRAME_HAS_VERTICAL_SCROLLBARS): New
accessors, for both the MULTI_FRAME and non-MULTI_FRAME.
(VERTICAL_SCROLLBAR_WIDTH, WINDOW_VERTICAL_SCROLLBAR,
WINDOW_VERTICAL_SCROLLBAR_COLUMN,
WINDOW_VERTICAL_SCROLLBAR_HEIGHT): New macros.
* window.h (struct window): New field `vertical_scrollbar'.
* xterm.h (struct x_display): vertical_scrollbars,
judge_timestamp, vertical_scrollbar_extra: New fields.
(struct scrollbar): New struct.
(VERTICAL_SCROLLBAR_PIXEL_WIDTH, VERTICAL_SCROLLBAR_PIXEL_HEIGHT,
VERTICAL_SCROLLBAR_LEFT_BORDER, VERTICAL_SCROLLBAR_RIGHT_BORDER,
VERTICAL_SCROLLBAR_TOP_BORDER, VERTICAL_SCROLLBAR_BOTTOM_BORDER,
CHAR_TO_PIXEL_WIDTH, CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_WIDTH,
PIXEL_TO_CHAR_HEIGHT): New accessors and macros.
* frame.c (make_frame): Initialize the `can_have_scrollbars' and
`has_vertical_scrollbars' fields of the frame.
* term.c (term_init): Note that TERMCAP terminals don't support
scrollbars.
(mouse_position_hook): Document new args.
(set_vertical_scrollbar_hook, condemn_scrollbars_hook,
redeem_scrollbar_hook, judge_scrollbars_hook): New hooks.
* termhooks.h: Declare and document them.
(enum scrollbar_part): New type.
(struct input_event): Describe the new form of the scrollbar_click
event type. Change `part' from a Lisp_Object to an enum
scrollbar_part. Add a new field `scrollbar'.
* keyboard.c (kbd_buffer_get_event): Pass appropriate new
parameters to *mouse_position_hook, and make_lispy_movement.
* xfns.c (x_set_vertical_scrollbar): New function.
(x_figure_window_size): Use new macros to calculate frame size.
(Fx_create_frame): Note that X Windows frames do support scroll
bars. Default to "yes".
* xterm.c: #include <X11/cursorfont.h> and "window.h".
(x_vertical_scrollbar_cursor): New variable.
(x_term_init): Initialize it.
(last_mouse_bar, last_mouse_bar_frame, last_mouse_part,
last_mouse_scroll_range_start, last_mouse_scroll_range_end): New
variables.
(XTmouse_position): Use them to return scrollbar movement events.
Take new arguments, for that purpose.
(x_window_to_scrollbar, x_scrollbar_create,
x_scrollbar_set_handle, x_scrollbar_remove, x_scrollbar_move,
XTset_scrollbar, XTcondemn_scrollbars, XTredeem_scrollbar,
XTjudge_scrollbars, x_scrollbar_expose,
x_scrollbar_background_expose, x_scrollbar_handle_click,
x_scrollbar_handle_motion): New functions to implement scrollbars.
(x_term_init): Set the termhooks.h hooks to point to them.
(x_set_window_size): Use new macros to calculate frame size. Set
vertical_scrollbar_extra field.
(x_make_frame_visible): Use the frame accessor
FRAME_HAS_VERTICAL_SCROLLBARS to decide if we need to map the
frame's subwindows as well.
(XTread_socket): Use new size-calculation macros from xterm.h when
processing ConfigureNotify events.
(x_wm_set_size_hint): Use PIXEL_TO_CHAR_WIDTH and
PIXEL_TO_CHAR_HEIGHT macros.
* ymakefile (xdisp.o): This now depends on termhooks.h.
(xterm.o): This now depends on window.h.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Thu, 24 Dec 1992 06:17:18 +0000 |
| parents | 9baddd0338d5 |
| children | 2c7997f249eb |
| rev | line source |
|---|---|
|
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
1 ;;; spell.el --- spelling correction interface for Emacs. |
|
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
2 |
| 841 | 3 ;; Copyright (C) 1985 Free Software Foundation, Inc. |
| 4 | |
|
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
5 ;; Maintainer: FSF |
| 36 | 6 |
| 7 ;; This file is part of GNU Emacs. | |
| 8 | |
| 9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 10 ;; it under the terms of the GNU General Public License as published by | |
|
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
787
diff
changeset
|
11 ;; the Free Software Foundation; either version 2, or (at your option) |
| 36 | 12 ;; any later version. |
| 13 | |
| 14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 17 ;; GNU General Public License for more details. | |
| 18 | |
| 19 ;; You should have received a copy of the GNU General Public License | |
| 20 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
| 21 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
| 22 | |
|
787
3cece0106722
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
23 ;;; Code: |
| 36 | 24 |
| 25 (defvar spell-command "spell" | |
| 26 "*Command to run the spell program.") | |
| 27 | |
| 28 (defvar spell-filter nil | |
| 29 "*Filter function to process text before passing it to spell program. | |
| 30 This function might remove text-processor commands. | |
| 31 nil means don't alter the text before checking it.") | |
| 32 | |
| 258 | 33 ;;;###autoload |
| 36 | 34 (defun spell-buffer () |
| 35 "Check spelling of every word in the buffer. | |
| 36 For each incorrect word, you are asked for the correct spelling | |
| 37 and then put into a query-replace to fix some or all occurrences. | |
| 38 If you do not want to change a word, just give the same word | |
| 39 as its \"correct\" spelling; then the query replace is skipped." | |
| 40 (interactive) | |
| 41 (spell-region (point-min) (point-max) "buffer")) | |
| 42 | |
| 258 | 43 ;;;###autoload |
| 36 | 44 (defun spell-word () |
| 45 "Check spelling of word at or before point. | |
| 46 If it is not correct, ask user for the correct spelling | |
| 1541 | 47 and `query-replace' the entire buffer to substitute it." |
| 36 | 48 (interactive) |
| 49 (let (beg end spell-filter) | |
| 50 (save-excursion | |
| 51 (if (not (looking-at "\\<")) | |
| 52 (forward-word -1)) | |
| 53 (setq beg (point)) | |
| 54 (forward-word 1) | |
| 55 (setq end (point))) | |
| 56 (spell-region beg end (buffer-substring beg end)))) | |
| 57 | |
| 258 | 58 ;;;###autoload |
| 36 | 59 (defun spell-region (start end &optional description) |
| 1541 | 60 "Like `spell-buffer' but applies only to region. |
| 36 | 61 Used in a program, applies from START to END. |
| 62 DESCRIPTION is an optional string naming the unit being checked: | |
| 63 for example, \"word\"." | |
| 64 (interactive "r") | |
| 65 (let ((filter spell-filter) | |
| 66 (buf (get-buffer-create " *temp*"))) | |
| 67 (save-excursion | |
| 68 (set-buffer buf) | |
| 69 (widen) | |
| 70 (erase-buffer)) | |
| 71 (message "Checking spelling of %s..." (or description "region")) | |
| 72 (if (and (null filter) (= ?\n (char-after (1- end)))) | |
| 73 (if (string= "spell" spell-command) | |
| 74 (call-process-region start end "spell" nil buf) | |
| 75 (call-process-region start end shell-file-name | |
| 76 nil buf nil "-c" spell-command)) | |
| 77 (let ((oldbuf (current-buffer))) | |
| 78 (save-excursion | |
| 79 (set-buffer buf) | |
| 80 (insert-buffer-substring oldbuf start end) | |
| 81 (or (bolp) (insert ?\n)) | |
| 82 (if filter (funcall filter)) | |
| 83 (if (string= "spell" spell-command) | |
| 84 (call-process-region (point-min) (point-max) "spell" t buf) | |
| 85 (call-process-region (point-min) (point-max) shell-file-name | |
| 86 t buf nil "-c" spell-command))))) | |
| 87 (message "Checking spelling of %s...%s" | |
| 88 (or description "region") | |
| 89 (if (save-excursion | |
| 90 (set-buffer buf) | |
| 91 (> (buffer-size) 0)) | |
| 92 "not correct" | |
| 93 "correct")) | |
| 94 (let (word newword | |
| 95 (case-fold-search t) | |
| 96 (case-replace t)) | |
| 97 (while (save-excursion | |
| 98 (set-buffer buf) | |
| 99 (> (buffer-size) 0)) | |
| 100 (save-excursion | |
| 101 (set-buffer buf) | |
| 102 (goto-char (point-min)) | |
| 103 (setq word (downcase | |
| 104 (buffer-substring (point) | |
| 105 (progn (end-of-line) (point))))) | |
| 106 (forward-char 1) | |
| 107 (delete-region (point-min) (point)) | |
| 108 (setq newword | |
| 109 (read-input (concat "`" word | |
| 110 "' not recognized; edit a replacement: ") | |
| 111 word)) | |
| 112 (flush-lines (concat "^" (regexp-quote word) "$"))) | |
| 113 (if (not (equal word newword)) | |
| 114 (progn | |
| 115 (goto-char (point-min)) | |
| 116 (query-replace-regexp (concat "\\b" (regexp-quote word) "\\b") | |
| 117 newword))))))) | |
| 118 | |
| 119 | |
| 258 | 120 ;;;###autoload |
| 36 | 121 (defun spell-string (string) |
| 122 "Check spelling of string supplied as argument." | |
| 123 (interactive "sSpell string: ") | |
| 124 (let ((buf (get-buffer-create " *temp*"))) | |
| 125 (save-excursion | |
| 126 (set-buffer buf) | |
| 127 (widen) | |
| 128 (erase-buffer) | |
| 129 (insert string "\n") | |
| 130 (if (string= "spell" spell-command) | |
| 131 (call-process-region (point-min) (point-max) "spell" | |
| 132 t t) | |
| 133 (call-process-region (point-min) (point-max) shell-file-name | |
| 134 t t nil "-c" spell-command)) | |
| 135 (if (= 0 (buffer-size)) | |
| 136 (message "%s is correct" string) | |
| 137 (goto-char (point-min)) | |
| 138 (while (search-forward "\n" nil t) | |
| 139 (replace-match " ")) | |
| 140 (message "%sincorrect" (buffer-substring 1 (point-max))))))) | |
|
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
141 |
|
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
142 ;;; spell.el ends here |
