Now on revision 106679. ------------------------------------------------------------ revno: 106679 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Thu 2011-12-15 16:51:30 +0900 message: Fix Ethiopic related codes for deleted variables and functions. diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2011-12-04 08:02:42 +0000 +++ leim/ChangeLog 2011-12-15 07:50:05 +0000 @@ -1,3 +1,8 @@ +2011-12-15 Kenichi Handa + + * quail/ethiopic.el ("ethiopic"): Do not refer to + ethio-prefer-ascii-punctuation. + 2011-11-20 Juanma Barranquero * quail/hangul.el (hangul-character): Fix typo. === modified file 'leim/quail/ethiopic.el' --- leim/quail/ethiopic.el 2011-11-25 07:14:48 +0000 +++ leim/quail/ethiopic.el 2011-12-15 07:50:05 +0000 @@ -39,7 +39,7 @@ "ethiopic" "Ethiopic" '("$(3$Q#U!.(B " (ethio-prefer-ascii-space "_" "$(3$h(B") - (ethio-prefer-ascii-punctuation "." "$(3$i(B")) + "$(3$i(B") t " Quail package for Ethiopic (Tigrigna and Amharic) When you are in Ethiopic language environment, the following special === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-14 21:05:20 +0000 +++ lisp/ChangeLog 2011-12-15 07:50:05 +0000 @@ -1,3 +1,9 @@ +2011-12-15 Kenichi Handa + + * language/ethio-util.el: Change coding tag to utf-8-emacs. + (setup-ethiopic-environment-internal): Comment out key-binding for + ethio-toggle-punctuation. + 2011-12-13 Alan Mackenzie Add the switch statement to AWK Mode. === modified file 'lisp/language/ethio-util.el' --- lisp/language/ethio-util.el 2011-12-05 08:55:25 +0000 +++ lisp/language/ethio-util.el 2011-12-15 07:50:05 +0000 @@ -1,4 +1,4 @@ -;;; ethio-util.el --- utilities for Ethiopic -*- coding: utf-8; -*- +;;; ethio-util.el --- utilities for Ethiopic -*- coding: utf-8-emacs; -*- ;; Copyright (C) 1997-1998, 2002-2011 Free Software Foundation, Inc. ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, @@ -48,7 +48,7 @@ ([f4] . ethio-sera-to-fidel-buffer) ([S-f4] . ethio-sera-to-fidel-region) ([C-f4] . ethio-sera-to-fidel-marker) - ([S-f5] . ethio-toggle-punctuation) + ;; ([S-f5] . ethio-toggle-punctuation) ([S-f6] . ethio-modify-vowel) ([S-f7] . ethio-replace-space) ;; ([S-f8] . ethio-input-special-character) ; deprecated ------------------------------------------------------------ revno: 106678 committer: Paul Eggert branch nick: trunk timestamp: Wed 2011-12-14 23:24:10 -0800 message: Spelling fixes. diff: === modified file 'configure.in' --- configure.in 2011-12-10 12:33:07 +0000 +++ configure.in 2011-12-15 07:24:10 +0000 @@ -1683,7 +1683,7 @@ ## Use mmap directly for allocating larger buffers. ## FIXME this comes from src/s/{gnu,gnu-linux}.h: ## #ifdef DOUG_LEA_MALLOC; #undef REL_ALLOC; #endif - ## Does the AC_FUNC_MMAP test below make this check unecessary? + ## Does the AC_FUNC_MMAP test below make this check unnecessary? case "$opsys" in gnu*) REL_ALLOC=no ;; esac === modified file 'doc/misc/ede.texi' --- doc/misc/ede.texi 2011-11-23 07:03:56 +0000 +++ doc/misc/ede.texi 2011-12-15 07:24:10 +0000 @@ -705,11 +705,11 @@ by the @samp{ede-speedbar} interface. @item ede-want-file-p Return non-nil if a target will accept a given file. -It is generally unecessary to override this. See the section on source +It is generally unnecessary to override this. See the section on source code. @item ede-buffer-mine Return non-nil if a buffer belongs to this target. Used during -association when a file is loaded. It is generally unecessary to +association when a file is loaded. It is generally unnecessary to override this unless you keep auxiliary files. @end table === modified file 'doc/misc/semantic.texi' --- doc/misc/semantic.texi 2011-11-25 07:14:48 +0000 +++ doc/misc/semantic.texi 2011-12-15 07:24:10 +0000 @@ -380,7 +380,7 @@ @item semanticdb-ref.el Tracks crossreferences. Cross references are needed when buffer is -reparsed, and must alert other tables that any dependant caches may +reparsed, and must alert other tables that any dependent caches may need to be flushed. References are in the form of include files. @end table === modified file 'etc/NEWS.22' --- etc/NEWS.22 2011-11-27 04:43:11 +0000 +++ etc/NEWS.22 2011-12-15 07:24:10 +0000 @@ -4273,7 +4273,7 @@ further filter candidate files. One advantage of using this function is that the list of suffixes in -`exec-suffixes' is OS-dependant, so this function will find +`exec-suffixes' is OS-dependent, so this function will find executables without polluting Lisp code with OS dependencies. *** The new function `file-remote-p' tests a file name and returns === modified file 'lisp/arc-mode.el' --- lisp/arc-mode.el 2011-11-17 17:40:48 +0000 +++ lisp/arc-mode.el 2011-12-15 07:24:10 +0000 @@ -860,13 +860,13 @@ dir))) (if (or alien (file-exists-p fullname)) (progn - ;; Maked sure all the leading directories in + ;; Make sure all the leading directories in ;; archive-local-name exist under archive-tmpdir, so that ;; the directory structure recorded in the archive is ;; reconstructed in the temporary directory. (make-directory (file-name-directory tmpfile) t) (make-temp-file tmpfile)) - ;; Maked sure all the leading directories in `fullname' exist + ;; Make sure all the leading directories in `fullname' exist ;; under archive-tmpdir. This is necessary for nested archives ;; (`archive-extract' sets `archive-remote' to t in case ;; an archive occurs inside another archive). === modified file 'lisp/cedet/semantic/scope.el' --- lisp/cedet/semantic/scope.el 2011-11-20 07:30:16 +0000 +++ lisp/cedet/semantic/scope.el 2011-12-15 07:24:10 +0000 @@ -725,7 +725,7 @@ (oset scopecache localargs localargs) (oset scopecache localvar localvar) ))) - ;; Make sure we become dependant on the typecache. + ;; Make sure we become dependent on the typecache. (semanticdb-typecache-add-dependant scopecache) ;; Handy debug output. (when (called-interactively-p 'any) === modified file 'lisp/dframe.el' --- lisp/dframe.el 2011-11-27 04:43:11 +0000 +++ lisp/dframe.el 2011-12-15 07:24:10 +0000 @@ -221,7 +221,7 @@ (define-key map [mouse-2] 'dframe-click) ;; This is the power click for new frames, or refreshing a cache (define-key map [S-mouse-2] 'dframe-power-click) - ;; This adds a small unecessary visual effect + ;; This adds a small unnecessary visual effect ;;(define-key map [down-mouse-2] 'dframe-quick-mouse) (define-key map [down-mouse-3] 'dframe-popup-kludge) === modified file 'lisp/emacs-lisp/pcase.el' --- lisp/emacs-lisp/pcase.el 2011-03-16 20:08:39 +0000 +++ lisp/emacs-lisp/pcase.el 2011-12-15 07:24:10 +0000 @@ -363,12 +363,12 @@ (dolist (branch rest) (let* ((match (car branch)) (code&vars (cdr branch)) - (splitted + (split (pcase--split-match sym splitter match))) - (unless (eq (car splitted) :pcase--fail) - (push (cons (car splitted) code&vars) then-rest)) - (unless (eq (cdr splitted) :pcase--fail) - (push (cons (cdr splitted) code&vars) else-rest)))) + (unless (eq (car split) :pcase--fail) + (push (cons (car split) code&vars) then-rest)) + (unless (eq (cdr split) :pcase--fail) + (push (cons (cdr split) code&vars) else-rest)))) (cons (nreverse then-rest) (nreverse else-rest)))) (defun pcase--split-consp (syma symd pat) === modified file 'lisp/filesets.el' --- lisp/filesets.el 2011-11-27 04:43:11 +0000 +++ lisp/filesets.el 2011-12-15 07:24:10 +0000 @@ -453,7 +453,7 @@ :group 'filesets) (defcustom filesets-max-entry-length 50 - "Truncate names of splitted submenus to this length." + "Truncate names of split submenus to this length." :set (function filesets-set-default) :type 'integer :group 'filesets) === modified file 'lisp/international/ccl.el' --- lisp/international/ccl.el 2011-12-05 08:55:25 +0000 +++ lisp/international/ccl.el 2011-12-15 07:24:10 +0000 @@ -1469,7 +1469,7 @@ | de-sjis ;; If ARG_0 and ARG_1 are the first and second code point of - ;; JISX0208 character CHAR, and SJIS is the correponding + ;; JISX0208 character CHAR, and SJIS is the corresponding ;; Shift-JIS code, ;; (REG = ARG_0 en-sjis ARG_1) means: ;; ((REG = HIGH) === modified file 'lisp/international/quail.el' --- lisp/international/quail.el 2011-12-04 08:02:42 +0000 +++ lisp/international/quail.el 2011-12-15 07:24:10 +0000 @@ -2832,7 +2832,7 @@ TRANSITION-n-m are transition rules from STATE-n, and have the form \(RULES . STATE-x) or RULES, where STATE-x is one of STATE-n above, RULES is a symbol whose value is an alist of keys \(string) vs the -correponding characters or strings. The format of the symbol value of +corresponding characters or strings. The format of the symbol value of RULES is the same as arguments to `quail-define-rules'. If TRANSITION-n-m has the form (RULES . STATE-x), it means that @@ -2846,7 +2846,7 @@ function `quail-install-map' (which see)." (let ((state-alist (mapcar (lambda (x) (list (car x))) table)) tail elt) - ;; STATE-ALIST is an alist of states vs the correponding sub Quail + ;; STATE-ALIST is an alist of states vs the corresponding sub Quail ;; map. It is now initialized to ((STATE-0) (STATE-1) ...). ;; Set key sequence mapping rules in cdr part of each element. (while table === modified file 'lisp/international/titdic-cnv.el' --- lisp/international/titdic-cnv.el 2011-12-04 08:02:42 +0000 +++ lisp/international/titdic-cnv.el 2011-12-15 07:24:10 +0000 @@ -103,7 +103,7 @@ \\ -For double-width GB2312 characters correponding to ASCII, use the +For double-width GB2312 characters corresponding to ASCII, use the input method `chinese-qj'.") ("chinese-ecdict" "$(05CKH(B" @@ -191,7 +191,7 @@ a Pinyin, the next \"3\" specifies tone, and the last \"3\" selects the third character from the candidate list. -For double-width GB2312 characters correponding to ASCII, use the +For double-width GB2312 characters corresponding to ASCII, use the input method `chinese-qj'.") ("chinese-zozy" "$(0I\0D(B" === modified file 'lisp/org/org-protocol.el' --- lisp/org/org-protocol.el 2011-12-04 08:02:42 +0000 +++ lisp/org/org-protocol.el 2011-12-15 07:24:10 +0000 @@ -546,8 +546,8 @@ (when (string-match proto fname) (let* ((func (plist-get (cdr prolist) :function)) (greedy (plist-get (cdr prolist) :greedy)) - (splitted (split-string fname proto)) - (result (if greedy restoffiles (cadr splitted)))) + (split (split-string fname proto)) + (result (if greedy restoffiles (cadr split)))) (when (plist-get (cdr prolist) :kill-client) (message "Greedy org-protocol handler. Killing client.") (server-edit)) === modified file 'lisp/printing.el' --- lisp/printing.el 2011-12-09 03:12:38 +0000 +++ lisp/printing.el 2011-12-15 07:24:10 +0000 @@ -4710,12 +4710,12 @@ M-x pr-ps-fast-fire RET The command prompts the user for a N-UP value and printing will - immediatelly be done using the current active printer. + immediately be done using the current active printer. C-u M-x pr-ps-fast-fire RET C-u 0 M-x pr-ps-fast-fire RET The command prompts the user for a N-UP value and also for a current - PostScript printer, then printing will immediatelly be done using the new + PostScript printer, then printing will immediately be done using the new current active printer. C-u 1 M-x pr-ps-fast-fire RET @@ -4736,7 +4736,7 @@ If it's nil, send the image to the printer. If it's a list or an integer lesser or equal to zero, the command prompts - the user for a current PostScript printer, then printing will immediatelly + the user for a current PostScript printer, then printing will immediately be done using the new current active printer. If it's an integer equal to 1, the command prompts the user for a file name @@ -4749,7 +4749,7 @@ instead of sending it to the printer. If it's a symbol which it's defined in `pr-ps-printer-alist', it's the new - active printer and printing will immediatelly be done using the new active + active printer and printing will immediately be done using the new active printer. Otherwise, send the image to the printer. @@ -4800,7 +4800,7 @@ If it's nil, the printing is sent to the current active text printer. If it's a symbol which it's defined in `pr-txt-printer-alist', it's the new - active printer and printing will immediatelly be done using the new active + active printer and printing will immediately be done using the new active printer. If it's non-nil, the command prompts the user for a new active text printer. === modified file 'lisp/progmodes/cperl-mode.el' --- lisp/progmodes/cperl-mode.el 2011-11-27 04:43:11 +0000 +++ lisp/progmodes/cperl-mode.el 2011-12-15 07:24:10 +0000 @@ -958,7 +958,7 @@ `cperl-array-face' Array names `cperl-hash-face' Hash names `font-lock-comment-face' Comments, PODs and whatever is considered - syntaxically to be not code + syntactically to be not code `font-lock-constant-face' HERE-doc delimiters, labels, delimiters of 2-arg operators s/y/tr/ or of RExen, `font-lock-warning-face' Special-cased m// and s//foo/, @@ -970,7 +970,7 @@ `cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen `font-lock-string-face' Strings, qw() constructs, RExen, POD sections, literal parts and the terminator of formats - and whatever is syntaxically considered + and whatever is syntactically considered as string literals `font-lock-type-face' Overridable keywords `font-lock-variable-name-face' Variable declarations, indirect array and @@ -1537,8 +1537,8 @@ since most the time you mean \"less\". CPerl mode tries to guess whether you want to type pair <>, and inserts is if it appropriate. You can set `cperl-electric-parens-string' to the string that -contains the parenths from the above list you want to be electrical. -Electricity of parenths is controlled by `cperl-electric-parens'. +contains the parens from the above list you want to be electrical. +Electricity of parens is controlled by `cperl-electric-parens'. You may also set `cperl-electric-parens-mark' to have electric parens look for active mark and \"embrace\" a region if possible.' @@ -3517,7 +3517,7 @@ (defvar font-lock-warning-face) (defun cperl-find-sub-attrs (&optional st-l b-fname e-fname pos) - "Syntaxically mark (and fontify) attributes of a subroutine. + "Syntactically mark (and fontify) attributes of a subroutine. Should be called with the point before leading colon of an attribute." ;; Works *before* syntax recognition is done (or st-l (setq st-l (list nil))) ; Avoid overwriting '() @@ -4994,7 +4994,7 @@ (setq top (point)) ;; Plan A: if line has an unfinished paren-group, go to end-of-group (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1))) - (setq top (point))) ; Get the outermost parenths in line + (setq top (point))) ; Get the outermost parens in line (goto-char top) (while (< (point) tmp-end) (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol @@ -5906,7 +5906,7 @@ 3 font-lock-variable-name-face))) '("\\= 0 go forwards, ARG < 0 go backwards. -Returns non-nil if successfull." +Returns non-nil if successful." (interactive "p") (let (status) (if (< arg 0) === modified file 'src/ChangeLog.11' --- src/ChangeLog.11 2011-12-04 08:02:42 +0000 +++ src/ChangeLog.11 2011-12-15 07:24:10 +0000 @@ -30657,7 +30657,7 @@ (display_buffer): Do not set split_height_threshold to twice the value of window_min_height to avoid changing the value of a customizable variable. Rather explicitly check whether the - height of the window that shall be splitted is at least as large + height of the window that shall be split is at least as large as split_height_threshold. (Fwindow_full_width_p): New defun. (syms_of_window): Defsubr it. === modified file 'src/ChangeLog.8' --- src/ChangeLog.8 2011-12-14 21:05:20 +0000 +++ src/ChangeLog.8 2011-12-15 07:24:10 +0000 @@ -11485,7 +11485,7 @@ Substitute homedir by `~' also in default_filename. * xdisp.c (try_window_id): Fix computation of tab_offset when - backing up over a character that is splitted across lines. + backing up over a character that is split across lines. 1999-05-08 Kenichi HANDA === modified file 'src/charset.c' --- src/charset.c 2011-11-27 04:43:11 +0000 +++ src/charset.c 2011-12-15 07:24:10 +0000 @@ -1660,7 +1660,7 @@ } -/* Return a character correponding to the code-point CODE of +/* Return a character corresponding to the code-point CODE of CHARSET. */ int === modified file 'src/charset.h' --- src/charset.h 2011-11-14 21:00:24 +0000 +++ src/charset.h 2011-12-15 07:24:10 +0000 @@ -238,7 +238,7 @@ int unified_p; }; -/* Hash table of charset symbols vs. the correponding attribute +/* Hash table of charset symbols vs. the corresponding attribute vectors. */ extern Lisp_Object Vcharset_hash_table; @@ -389,7 +389,7 @@ #endif -/* Return a character correponding to the code-point CODE of CHARSET. +/* Return a character corresponding to the code-point CODE of CHARSET. Try some optimization before calling decode_char. */ #define DECODE_CHAR(charset, code) \ === modified file 'src/font.h' --- src/font.h 2011-12-06 01:30:54 +0000 +++ src/font.h 2011-12-15 07:24:10 +0000 @@ -621,7 +621,7 @@ /* Optional. Get coordinates of the INDEXth anchor point of the glyph whose code is CODE. Store the coordinates in *X and *Y. Return 0 if - the operations was successfull. Otherwise return -1. */ + the operations was successful. Otherwise return -1. */ int (*anchor_point) (struct font *font, unsigned code, int index, int *x, int *y); === modified file 'src/w16select.c' --- src/w16select.c 2011-09-09 01:06:52 +0000 +++ src/w16select.c 2011-12-15 07:24:10 +0000 @@ -114,7 +114,7 @@ return regs.x.ax; } -/* Open the clipboard, return non-zero if successfull. */ +/* Open the clipboard, return non-zero if successful. */ unsigned open_clipboard (void) { @@ -137,7 +137,7 @@ return regs.x.ax; } -/* Empty clipboard, return non-zero if successfull. */ +/* Empty clipboard, return non-zero if successful. */ unsigned empty_clipboard (void) { @@ -207,7 +207,7 @@ } } -/* Copy data into the clipboard, return zero if successfull. */ +/* Copy data into the clipboard, return zero if successful. */ unsigned set_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw) { @@ -405,7 +405,7 @@ return (unsigned) (dp - (unsigned char *)Data - 1); } -/* Close clipboard, return non-zero if successfull. */ +/* Close clipboard, return non-zero if successful. */ unsigned close_clipboard (void) { @@ -730,4 +730,3 @@ } #endif /* MSDOS */ - === modified file 'src/w32font.c' --- src/w32font.c 2011-11-20 19:35:27 +0000 +++ src/w32font.c 2011-12-15 07:24:10 +0000 @@ -786,7 +786,7 @@ Optional. Get coordinates of the INDEXth anchor point of the glyph whose code is CODE. Store the coordinates in *X and *Y. Return 0 if - the operations was successfull. Otherwise return -1. + the operations was successful. Otherwise return -1. static int w32font_anchor_point (struct font *font, unsigned code, int index, int *x, int *y); ------------------------------------------------------------ revno: 106677 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Thu 2011-12-15 11:12:56 +0900 message: xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background (Bug#8992). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-12-13 13:58:20 +0000 +++ src/ChangeLog 2011-12-15 02:12:08 +0000 @@ -1,3 +1,8 @@ +2011-12-15 YAMAMOTO Mitsuharu + + * xftfont.c (xftfont_draw): Use the font metrics of s->font to + fill background (Bug#8992). + 2011-12-13 Martin Rudalics * window.c (Vwindow_combination_resize) === modified file 'src/xftfont.c' --- src/xftfont.c 2011-03-19 05:07:42 +0000 +++ src/xftfont.c 2011-12-15 02:12:08 +0000 @@ -654,7 +654,7 @@ if (with_background) XftDrawRect (xft_draw, &bg, - x, y - face->font->ascent, s->width, face->font->height); + x, y - s->font->ascent, s->width, s->font->height); code = alloca (sizeof (FT_UInt) * len); for (i = 0; i < len; i++) code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) ------------------------------------------------------------ revno: 106676 committer: Paul Eggert branch nick: trunk timestamp: Wed 2011-12-14 13:05:20 -0800 message: Spelling fixes. diff: === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-12-12 05:32:49 +0000 +++ doc/misc/gnus.texi 2011-12-14 21:05:20 +0000 @@ -11634,7 +11634,7 @@ @item r (Article) @kindex r (Article) Prompt for a file name, replace the @acronym{MIME} object with an -external body refering to the file via the message/external-body +external body referring to the file via the message/external-body @acronym{MIME} type. (@code{gnus-mime-replace-part}). @findex gnus-mime-delete-part @@ -30012,7 +30012,7 @@ @node Score File Syntax @subsection Score File Syntax -Score files are meant to be easily parseable, but yet extremely +Score files are meant to be easily parsable, but yet extremely malleable. It was decided that something that had the same read syntax as an Emacs Lisp list would fit that spec. === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2011-12-04 08:02:42 +0000 +++ doc/misc/org.texi 2011-12-14 21:05:20 +0000 @@ -12469,7 +12469,7 @@ Results assumed to be LaTeX and are enclosed in a @code{begin_latex} block. E.g., @code{:results value latex}. @item @code{code} -Result are assumed to be parseable code and are enclosed in a code block. +Result are assumed to be parsable code and are enclosed in a code block. E.g., @code{:results value code}. @item @code{pp} The result is converted to pretty-printed code and is enclosed in a code === modified file 'doc/misc/rcirc.texi' --- doc/misc/rcirc.texi 2011-06-28 10:18:02 +0000 +++ doc/misc/rcirc.texi 2011-12-14 21:05:20 +0000 @@ -524,7 +524,7 @@ @item rcirc-authinfo @vindex rcirc-authinfo -@cindex authentification +@cindex authentication @cindex identification @cindex nickserv @cindex login @@ -547,7 +547,7 @@ @table @code @item nickserv -@cindex nickserv authentification +@cindex nickserv authentication Use this symbol if you need to identify yourself as follows when connecting to a network: @code{/msg nickserv identify secret}. The necessary arguments are the nickname you want to use this for, and the @@ -558,7 +558,7 @@ details. (Using @code{/msg nickserv help}, for example.) @item chanserv -@cindex chanserv authentification +@cindex chanserv authentication Use this symbol if you need to identify yourself as follows if you want to join a particular channel: @code{/msg chanserv identify #underground secret}. The necessary arguments are the nickname and channel you want @@ -569,7 +569,7 @@ (Using @code{/msg chanserv help}, for example.) @item bitlbee -@cindex bitlbee authentification +@cindex bitlbee authentication Use this symbol if you need to identify yourself in the Bitlbee channel as follows: @code{identify secret}. The necessary arguments are the nickname you want to use this for, and the password to use. @@ -585,7 +585,7 @@ other instant messaging services. You can either install Bitlbee locally or use a public Bitlbee server. There, you need to create an account with a password. This is the nick and password you need to -provide for the bitlbee authentification method. +provide for the bitlbee authentication method. Later, you will tell Bitlbee about your accounts and passwords on all the other instant messaging services, and Bitlbee will log you in. All === modified file 'etc/NEWS.23' --- etc/NEWS.23 2011-12-05 08:55:25 +0000 +++ etc/NEWS.23 2011-12-14 21:05:20 +0000 @@ -1677,7 +1677,7 @@ When the variable `file-precious-flag' is set, the success of a remote file copy is checked via the file's checksum. -*** Passwords can be read from an authentification file. +*** Passwords can be read from an authentication file. Tramp uses the package `auth-source' to read passwords from a file, if necessary. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-13 21:13:51 +0000 +++ lisp/ChangeLog 2011-12-14 21:05:20 +0000 @@ -5275,7 +5275,7 @@ (ses-calculate-cell, ses-update-cells): Use Dijkstra algorithm for cycle detection. (ses-self-reference-early-detection): New defcustom. - (ses-formula-references): Robustify against self-refering cells. + (ses-formula-references): Robustify against self-referring cells. (ses-mode): Use ses-set-localvars. (ses-command-hook): Add call to ses-initialize-Dijkstra-attempt before lauching the update processing. === modified file 'lisp/ChangeLog.10' --- lisp/ChangeLog.10 2011-11-27 04:43:11 +0000 +++ lisp/ChangeLog.10 2011-12-14 21:05:20 +0000 @@ -8278,7 +8278,7 @@ 2002-11-17 Markus Rost * speedbar.el (defgroup speedbar): Use group 'etags instead of - nonexisting group 'tags. + nonexistent group 'tags. * emacs-lisp/re-builder.el: Add provide call. === modified file 'lisp/ChangeLog.11' --- lisp/ChangeLog.11 2011-11-25 13:26:30 +0000 +++ lisp/ChangeLog.11 2011-12-14 21:05:20 +0000 @@ -1744,7 +1744,7 @@ substitute-env-vars -- not quite shell compatible but better than nothing. (compilation-error-regexp-alist-alist): Simplify ftnchek to only - handle the newer versions messages, which are more parseable. + handle the newer versions messages, which are more parsable. 2004-11-22 Stefan Monnier === modified file 'lisp/ChangeLog.14' --- lisp/ChangeLog.14 2011-12-04 08:02:42 +0000 +++ lisp/ChangeLog.14 2011-12-14 21:05:20 +0000 @@ -19176,7 +19176,7 @@ toggle-read-only. * textmodes/bibtex.el (bibtex-format-entry): Handle error message - refering to a missing required field with the OPT prefix. + referring to a missing required field with the OPT prefix. Make unwindform more robust. * textmodes/bibtex.el: Remove support for hideshow minor mode as === modified file 'lisp/cedet/semantic/db-file.el' --- lisp/cedet/semantic/db-file.el 2011-11-17 09:09:20 +0000 +++ lisp/cedet/semantic/db-file.el 2011-12-14 21:05:20 +0000 @@ -193,16 +193,16 @@ (eieio-instance-tracker-find filename 'file 'semanticdb-database-list)) (defmethod semanticdb-file-directory-exists-p ((DB semanticdb-project-database-file) - &optional supress-questions) + &optional suppress-questions) "Does the directory the database DB needs to write to exist? -If SUPRESS-QUESTIONS, then do not ask to create the directory." +If SUPPRESS-QUESTIONS, then do not ask to create the directory." (let ((dest (file-name-directory (oref DB file))) ) (cond ((null dest) ;; @TODO - If it was never set up... what should we do ? nil) ((file-exists-p dest) t) - ((or supress-questions + ((or suppress-questions (and (boundp 'semanticdb--inhibit-make-directory) semanticdb--inhibit-make-directory)) nil) @@ -216,13 +216,13 @@ (defmethod semanticdb-save-db ((DB semanticdb-project-database-file) &optional - supress-questions) + suppress-questions) "Write out the database DB to its file. If DB is not specified, then use the current database." (let ((objname (oref DB file))) (when (and (semanticdb-dirty-p DB) (semanticdb-live-p DB) - (semanticdb-file-directory-exists-p DB supress-questions) + (semanticdb-file-directory-exists-p DB suppress-questions) (semanticdb-write-directory-p DB) ) ;;(message "Saving tag summary for %s..." objname) @@ -243,7 +243,7 @@ (t ;; @todo - It should ask if we are not called from a hook. ;; How? - (if (or supress-questions + (if (or suppress-questions (y-or-n-p (format "Skip Error: %s ?" (car (cdr foo))))) (message "Save Error: %S: %s" (car (cdr foo)) objname) === modified file 'lisp/cedet/semantic/db.el' --- lisp/cedet/semantic/db.el 2011-11-20 02:29:42 +0000 +++ lisp/cedet/semantic/db.el 2011-12-14 21:05:20 +0000 @@ -227,7 +227,7 @@ "Non nil if this table needs to be `Saved'.") (db-refs :initform nil :documentation - "List of `semanticdb-table' objects refering to this one. + "List of `semanticdb-table' objects referring to this one. These aren't saved, but are instead recalculated after load. See the file semantic/db-ref.el for how this slot is used.") (pointmax :initarg :pointmax @@ -657,7 +657,7 @@ ;;; SAVE/LOAD ;; (defmethod semanticdb-save-db ((DB semanticdb-project-database) - &optional supress-questions) + &optional suppress-questions) "Cause a database to save itself. The database base class does not save itself persistently. Subclasses could save themselves to a file, or to a database, or other === modified file 'lisp/cedet/semantic/idle.el' --- lisp/cedet/semantic/idle.el 2011-12-04 08:02:42 +0000 +++ lisp/cedet/semantic/idle.el 2011-12-14 21:05:20 +0000 @@ -246,8 +246,8 @@ ;; NOTE ON COMMENTED SAFE HERE ;; We used to not execute the services if the buffer was - ;; unparseable. We now assume that they are lexically - ;; safe to do, because we have marked the buffer unparseable + ;; unparsable. We now assume that they are lexically + ;; safe to do, because we have marked the buffer unparsable ;; if there was a problem. ;;(when safe (dolist (service semantic-idle-scheduler-queue) @@ -476,7 +476,7 @@ ;; do them here, then all the bovination hooks are not run, and ;; we save lots of time. (cond - ;; If the buffer was previously marked unparseable, + ;; If the buffer was previously marked unparsable, ;; then don't waste our time. ((semantic-parse-tree-unparseable-p) nil) === modified file 'lisp/cedet/semantic/lex.el' --- lisp/cedet/semantic/lex.el 2011-12-04 08:02:42 +0000 +++ lisp/cedet/semantic/lex.el 2011-12-14 21:05:20 +0000 @@ -1704,7 +1704,7 @@ nil)))) ;; Great Sadness. Assume that FORMS execute within the ;; confines of the current buffer only! Mark this thing - ;; unparseable iff the special symbol was thrown. This + ;; unparsable iff the special symbol was thrown. This ;; will prevent future calls from parsing, but will allow ;; then to still return the cache. (when ,ret === modified file 'lisp/cedet/semantic/util-modes.el' --- lisp/cedet/semantic/util-modes.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/semantic/util-modes.el 2011-12-14 21:05:20 +0000 @@ -109,7 +109,7 @@ (tail (or (memq elem minor-mode-alist) (setq minor-mode-alist (cons elem minor-mode-alist))))) - (setcdr tail (nconc locals (cdr tail))))))))) + (setcdr tail (nconc locals (cdr tail))))))))) (defun semantic-desktop-ignore-this-minor-mode (buffer) "Installed as a minor-mode initializer for Desktop mode. @@ -438,7 +438,7 @@ `-' -> The cache is up to date. `!' -> The cache requires a full update. `~' -> The cache needs to be incrementally parsed. - `%' -> The cache is not currently parseable. + `%' -> The cache is not currently parsable. `@' -> Auto-parse in progress (not set here.) With prefix argument ARG, turn on if positive, otherwise off. The minor mode can be turned on only if semantic feature is available and @@ -524,7 +524,7 @@ `-' -> The cache is up to date. `!' -> The cache requires a full update. `~' -> The cache needs to be incrementally parsed. - `%' -> The cache is not currently parseable. + `%' -> The cache is not currently parsable. `@' -> Auto-parse in progress (not set here.) Arguments IGNORE are ignored, and accepted so this can be used as a hook in many situations." === modified file 'lisp/erc/erc-backend.el' --- lisp/erc/erc-backend.el 2011-11-20 03:48:53 +0000 +++ lisp/erc/erc-backend.el 2011-12-14 21:05:20 +0000 @@ -991,7 +991,7 @@ (if (member (erc-response.command parsed-response) erc-server-prevent-duplicates) (let ((m (erc-response.unparsed parsed-response))) - ;; duplicate supression + ;; duplicate suppression (if (< (or (gethash m erc-server-duplicates) 0) (- (erc-current-time) erc-server-duplicate-timeout)) (erc-call-hooks process parsed-response)) === modified file 'lisp/gnus/ChangeLog.2' --- lisp/gnus/ChangeLog.2 2011-12-05 08:55:25 +0000 +++ lisp/gnus/ChangeLog.2 2011-12-14 21:05:20 +0000 @@ -8442,7 +8442,7 @@ 2002-07-21 Nevin Kapur - * nnmail.el (nnmail-fancy-expiry-target): Treat nonexisting + * nnmail.el (nnmail-fancy-expiry-target): Treat nonexistent headers as empty headers. 2002-07-21 Jochen Hein === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-11-27 18:17:40 +0000 +++ lisp/gnus/gnus-group.el 2011-12-14 21:05:20 +0000 @@ -992,7 +992,7 @@ 'gnus-group-tool-bar-retro) "Specifies the Gnus group tool bar. -It can be either a list or a symbol refering to a list. See +It can be either a list or a symbol referring to a list. See `gmm-tool-bar-from-list' for the format of the list. The default key map is `gnus-group-mode-map'. === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-12-08 06:22:03 +0000 +++ lisp/gnus/gnus-sum.el 2011-12-14 21:05:20 +0000 @@ -2835,7 +2835,7 @@ 'gnus-summary-tool-bar-retro) "Specifies the Gnus summary tool bar. -It can be either a list or a symbol refering to a list. See +It can be either a list or a symbol referring to a list. See `gmm-tool-bar-from-list' for the format of the list. The default key map is `gnus-summary-mode-map'. === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-12-10 01:51:53 +0000 +++ lisp/gnus/message.el 2011-12-14 21:05:20 +0000 @@ -7738,7 +7738,7 @@ 'message-tool-bar-retro) "Specifies the message mode tool bar. -It can be either a list or a symbol refering to a list. See +It can be either a list or a symbol referring to a list. See `gmm-tool-bar-from-list' for the format of the list. The default key map is `message-mode-map'. === modified file 'lisp/gnus/rfc2231.el' --- lisp/gnus/rfc2231.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/rfc2231.el 2011-12-14 21:05:20 +0000 @@ -58,7 +58,7 @@ ;; The most likely cause of an error is unbalanced parentheses ;; or double-quotes. If all parentheses and double-quotes are ;; quoted meaninglessly with backslashes, removing them might - ;; make it parseable. Let's try... + ;; make it parsable. Let's try... (error (let (mod) (when (and (string-match "\\\\\"" string) === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2011-12-12 05:32:49 +0000 +++ lisp/net/tramp-sh.el 2011-12-14 21:05:20 +0000 @@ -3526,7 +3526,7 @@ Here, we are looking for a command which has zero exit status if the file exists and nonzero exit status otherwise." (let ((existing "/") - (nonexisting + (nonexistent (tramp-shell-quote-argument "/ this file does not exist ")) result) ;; The algorithm is as follows: we try a list of several commands. @@ -3551,22 +3551,22 @@ (tramp-send-command-and-check vec (format "%s %s" result existing)) (not (tramp-send-command-and-check - vec (format "%s %s" result nonexisting)))) + vec (format "%s %s" result nonexistent)))) (and (setq result "/bin/test -e") (tramp-send-command-and-check vec (format "%s %s" result existing)) (not (tramp-send-command-and-check - vec (format "%s %s" result nonexisting)))) + vec (format "%s %s" result nonexistent)))) (and (setq result "/usr/bin/test -e") (tramp-send-command-and-check vec (format "%s %s" result existing)) (not (tramp-send-command-and-check - vec (format "%s %s" result nonexisting)))) + vec (format "%s %s" result nonexistent)))) (and (setq result (format "%s -d" (tramp-get-ls-command vec))) (tramp-send-command-and-check vec (format "%s %s" result existing)) (not (tramp-send-command-and-check - vec (format "%s %s" result nonexisting))))) + vec (format "%s %s" result nonexistent))))) (tramp-error vec 'file-error "Couldn't find command to check if file exists")) result)) === modified file 'lisp/url/url-http.el' --- lisp/url/url-http.el 2011-11-19 09:18:31 +0000 +++ lisp/url/url-http.el 2011-12-14 21:05:20 +0000 @@ -237,12 +237,12 @@ (if proxy-auth (setq proxy-auth (concat "Proxy-Authorization: " proxy-auth "\r\n"))) - ;; Protection against stupid values in the referer + ;; Protection against stupid values in the referrer (if (and ref-url (stringp ref-url) (or (string= ref-url "file:nil") (string= ref-url ""))) (setq ref-url nil)) - ;; We do not want to expose the referer if the user is paranoid. + ;; We do not want to expose the referrer if the user is paranoid. (if (or (memq url-privacy-level '(low high paranoid)) (and (listp url-privacy-level) (memq 'lastloc url-privacy-level))) === modified file 'lisp/vc/ediff-ptch.el' --- lisp/vc/ediff-ptch.el 2011-11-15 07:55:13 +0000 +++ lisp/vc/ediff-ptch.el 2011-12-14 21:05:20 +0000 @@ -373,7 +373,7 @@ (concat actual-dir (cdr proposed-file-names))))) )) ediff-patch-map) - ;; Check for the existing files in each pair and discard the nonexisting + ;; Check for the existing files in each pair and discard the nonexistent ;; ones. If both exist, ask the user. (mapcar (lambda (session-info) (let* ((file1 (car (ediff-get-session-objA-name session-info))) === modified file 'src/ChangeLog.7' --- src/ChangeLog.7 2011-11-20 03:48:53 +0000 +++ src/ChangeLog.7 2011-12-14 21:05:20 +0000 @@ -3968,7 +3968,7 @@ 1998-01-12 Kenichi Handa - * minibuf.c (Fminibuffer_complete_word): Fix a bug of refering + * minibuf.c (Fminibuffer_complete_word): Fix a bug of referring `i'. We must refer `i_byte' instead. * insdel.c (insert_from_string_1): Decrement GAP_SIZE by === modified file 'src/ChangeLog.8' --- src/ChangeLog.8 2011-12-04 08:02:42 +0000 +++ src/ChangeLog.8 2011-12-14 21:05:20 +0000 @@ -4027,7 +4027,7 @@ * dispextern.h (struct glyph_row): Flag internal_border_p removed. * xfns.c (x_create_tip_frame): Don't set bitmapIcon resource - because this will try to access a nonexisting widget. + because this will try to access a nonexistent widget. 1999-07-26 Markus Rost === modified file 'src/xselect.c' --- src/xselect.c 2011-12-05 08:55:25 +0000 +++ src/xselect.c 2011-12-14 21:05:20 +0000 @@ -757,7 +757,7 @@ /* The window we're communicating with may have been deleted in the meantime (that's a real situation from a bug report). In this case, there may be events in the event queue still - refering to the deleted window, and we'll get a BadWindow error + referring to the deleted window, and we'll get a BadWindow error in XTread_socket when processing the events. I don't have an idea how to fix that. gerd, 2001-01-98. */ /* 2004-09-10: XSync and UNBLOCK so that possible protocol errors are ------------------------------------------------------------ revno: 106675 committer: Alan Mackenzie branch nick: trunk timestamp: Tue 2011-12-13 21:13:51 +0000 message: Add the switch statement to AWK Mode. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-12-13 18:47:08 +0000 +++ lisp/ChangeLog 2011-12-13 21:13:51 +0000 @@ -1,5 +1,15 @@ 2011-12-13 Alan Mackenzie + Add the switch statement to AWK Mode. + + * progmodes/cc-awk (awk-font-lock-keywords): Add "switch", "case", + "default" to the keywords regexp. + + * progmodes/cc-langs (c-label-kwds): Let AWK take the same + expression as the rest. + (c-nonlabel-token-key): Allow string literals for AWK. Refactor + for the other modes. + Large brace-block initialisation makes CC Mode slow: Fix. Tidy up and accelerate c-in-literal, etc. by using the c-parse-state === modified file 'lisp/progmodes/cc-awk.el' --- lisp/progmodes/cc-awk.el 2011-12-12 05:32:49 +0000 +++ lisp/progmodes/cc-awk.el 2011-12-13 21:13:51 +0000 @@ -894,9 +894,9 @@ ;; Keywords. (concat "\\<" (regexp-opt - '("BEGIN" "END" "break" "continue" "delete" "do" "else" - "exit" "for" "getline" "if" "in" "next" "nextfile" - "return" "while") + '("BEGIN" "END" "break" "case" "continue" "default" "delete" + "do" "else" "exit" "for" "getline" "if" "in" "next" + "nextfile" "return" "switch" "while") t) "\\>") ;; Builtins. === modified file 'lisp/progmodes/cc-langs.el' --- lisp/progmodes/cc-langs.el 2011-12-12 05:32:49 +0000 +++ lisp/progmodes/cc-langs.el 2011-12-13 21:13:51 +0000 @@ -2242,8 +2242,7 @@ (c-lang-defconst c-label-kwds "Keywords introducing colon terminated labels in blocks." - t '("case" "default") - awk nil) + t '("case" "default")) (c-lang-defconst c-label-kwds-regexp ;; Adorned regexp matching any keyword that introduces a label. @@ -2998,18 +2997,19 @@ tested at the beginning of every sexp in a suspected label, i.e. before \":\". Only used if `c-recognize-colon-labels' is set." t (concat - ;; Don't allow string literals. - "\"\\|" ;; All keywords except `c-label-kwds' and `c-protection-kwds'. (c-make-keywords-re t (set-difference (c-lang-const c-keywords) (append (c-lang-const c-label-kwds) (c-lang-const c-protection-kwds)) :test 'string-equal))) + ;; Don't allow string literals, except in AWK. Character constants are OK. + (c objc java pike idl) (concat "\"\\|" + (c-lang-const c-nonlabel-token-key)) ;; Also check for open parens in C++, to catch member init lists in ;; constructors. We normally allow it so that macros with arguments ;; work in labels. - c++ (concat "\\s\(\\|" (c-lang-const c-nonlabel-token-key))) + c++ (concat "\\s\(\\|\"\\|" (c-lang-const c-nonlabel-token-key))) (c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key)) (c-lang-defconst c-nonlabel-token-2-key ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.