Mercurial > emacs
view lisp/textmodes/spell.el @ 109653:9cfca8c9fb07
Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
* configure.in: Check for util.h.
* src/bidi.c (bidi_dump_cached_states): Fix fprintf warning.
* src/emacs.c: Include src/nsterm.h if HAVE_NS.
* src/image.c (xpm_scan, xpm_make_color_table_v)
(xpm_put_color_table_v, xpm_get_color_table_v)
(xpm_make_color_table_h, xpm_put_color_table_h)
(xpm_get_color_table_h, xpm_str_to_color_key, xpm_load_image)
(xpm_load): Convert to ANSI C prototypes.
* src/lisp.h (fmod_float): Declare.
* src/menu.h (x_set_menu_bar_line): Declare.
(free_menubar_widget_value_tree et.al): Add HAVE_NS for these functions.
* src/window.c: Include menu.h.
* src/nsfns.m (have_menus_p, ns_display_info_for_name)
(x_set_cursor_type, ns_appkit_version_str)
(ns_appkit_version_int, ns_do_applescript)
(x_set_scroll_bar_default_width, x_sync, compute_tip_xy)
(syms_of_nsfns): Convert to ANSI C prototypes.
* src/nsfont.m (ns_fallback_entity, syms_of_nsfont): Convert to ANSI C
prototypes.
* src/nsimage.m (ns_load_image): Move NSTRACE after declarations.
* src/nsmenu.m (popup_activated, name_is_separator)
(syms_of_nsmenu): Convert to ANSI C prototypes.
(runMenuAt): Prototypes and move declarations before code.
* src/nsterm.h : Include sysselect.h.
(x_sync, x_get_focus_frame, x_set_mouse_position)
(x_set_mouse_pixel_position, x_make_frame_visible)
(x_make_frame_invisible, x_iconify_frame, x_char_width, x_char_height)
(x_pixel_width, x_pixel_height, x_set_frame_alpha, x_set_tool_bar_lines)
(x_activate_menubar, free_frame_menubar, ns_init_paths, ns_select)
(syms_of_nsterm, syms_of_nsfns, syms_of_nsmenu, syms_of_nsselect):
Declare
* src/process.c: Check HAVE_UTIL_H. Include src/nsterm.h if HAVE_NS.
* src/nsterm.m (ns_init_paths, ns_alloc_autorelease_pool)
(ns_ring_bell, ns_defined_color, hide_hourglass)
(x_display_pixel_height, x_display_pixel_width, syms_of_nsterm):
Convert to ANSI C prototypes.
(x_set_window_size, ns_draw_fringe_bitmap, judge): Move declarations
before code.
* src/sysdep.c: Check HAVE_TERM_H
* src/term.c: Check HAVE_SYS_IOCTL_H.
* src/unexmacosx.c (print_region_list, print_regions)
(build_region_list, find_emacs_zone_regions)
(unexec_regions_merge, read_load_commands, dump_it)
(unexec_init_emacs_zone): Convert to ANSI C prototypes.
* src/xfaces.c (x_create_gc, x_free_gc): Convert to ANSI C prototypes.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Fri, 06 Aug 2010 12:12:41 +0200 (2010-08-06) |
parents | 1d1d5d9bd884 |
children | 7c4da622f181 376148b31b5e |
line wrap: on
line source
;;; spell.el --- spelling correction interface for Emacs ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: wp, unix ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; This mode provides an Emacs interface to the UNIX spell(1) program. ;; Entry points are `spell-buffer', `spell-word', `spell-region' and ;; `spell-string'. ;; See also ispell.el for an interface to the ispell program. ;;; Code: (defgroup spell nil "Interface to the UNIX spell(1) program." :prefix "spell-" :group 'applications) (defcustom spell-command "spell" "*Command to run the spell program." :type 'string :group 'spell) (defcustom spell-filter nil "*Filter function to process text before passing it to spell program. This function might remove text-processor commands. nil means don't alter the text before checking it." :type '(choice (const nil) function) :group 'spell) ;;;###autoload (put 'spell-filter 'risky-local-variable t) ;;;###autoload (defun spell-buffer () "Check spelling of every word in the buffer. For each incorrect word, you are asked for the correct spelling and then put into a query-replace to fix some or all occurrences. If you do not want to change a word, just give the same word as its \"correct\" spelling; then the query replace is skipped." (interactive) ;; Don't warn about spell-region being obsolete. (with-no-warnings (spell-region (point-min) (point-max) "buffer"))) ;;;###autoload (make-obsolete 'spell-buffer 'ispell-buffer "23.1") ;;;###autoload (defun spell-word () "Check spelling of word at or before point. If it is not correct, ask user for the correct spelling and `query-replace' the entire buffer to substitute it." (interactive) (let (beg end spell-filter) (save-excursion (if (not (looking-at "\\<")) (forward-word -1)) (setq beg (point)) (forward-word 1) (setq end (point))) ;; Don't warn about spell-region being obsolete. (with-no-warnings (spell-region beg end (buffer-substring beg end))))) ;;;###autoload (make-obsolete 'spell-word 'ispell-word "23.1") ;;;###autoload (defun spell-region (start end &optional description) "Like `spell-buffer' but applies only to region. Used in a program, applies from START to END. DESCRIPTION is an optional string naming the unit being checked: for example, \"word\"." (interactive "r") (let ((filter spell-filter) (buf (get-buffer-create " *temp*"))) (with-current-buffer buf (widen) (erase-buffer)) (message "Checking spelling of %s..." (or description "region")) (if (and (null filter) (= ?\n (char-after (1- end)))) (if (string= "spell" spell-command) (call-process-region start end "spell" nil buf) (call-process-region start end shell-file-name nil buf nil "-c" spell-command)) (let ((oldbuf (current-buffer))) (with-current-buffer buf (insert-buffer-substring oldbuf start end) (or (bolp) (insert ?\n)) (if filter (funcall filter)) (if (string= "spell" spell-command) (call-process-region (point-min) (point-max) "spell" t buf) (call-process-region (point-min) (point-max) shell-file-name t buf nil "-c" spell-command))))) (message "Checking spelling of %s...%s" (or description "region") (if (with-current-buffer buf (> (buffer-size) 0)) "not correct" "correct")) (let (word newword (case-fold-search t) (case-replace t)) (while (with-current-buffer buf (> (buffer-size) 0)) (with-current-buffer buf (goto-char (point-min)) (setq word (downcase (buffer-substring (point) (progn (end-of-line) (point))))) (forward-char 1) (delete-region (point-min) (point)) (setq newword (read-string (concat "`" word "' not recognized; edit a replacement: ") word)) (flush-lines (concat "^" (regexp-quote word) "$"))) (if (not (equal word newword)) (progn (goto-char (point-min)) (query-replace-regexp (concat "\\b" (regexp-quote word) "\\b") newword))))))) ;;;###autoload (make-obsolete 'spell-region 'ispell-region "23.1") ;;;###autoload (defun spell-string (string) "Check spelling of string supplied as argument." (interactive "sSpell string: ") (let ((buf (get-buffer-create " *temp*"))) (with-current-buffer buf (widen) (erase-buffer) (insert string "\n") (if (string= "spell" spell-command) (call-process-region (point-min) (point-max) "spell" t t) (call-process-region (point-min) (point-max) shell-file-name t t nil "-c" spell-command)) (if (= 0 (buffer-size)) (message "%s is correct" string) (goto-char (point-min)) (while (search-forward "\n" nil t) (replace-match " ")) (message "%sincorrect" (buffer-substring 1 (point-max))))))) ;;;###autoload (make-obsolete 'spell-string "The `spell' package is obsolete - use `ispell'." "23.1") (provide 'spell) ;; arch-tag: 7eabb848-9c76-431a-bcdb-0e0592d2db04 ;;; spell.el ends here