aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2011-11-24 23:14:48 -0800
committerPaul Eggert2011-11-24 23:14:48 -0800
commite4920bc99dfcee02c3bb83b46a761b0893f76626 (patch)
treea6165f7a6c45f0b4924bad97b21ab179d3e7707e /lisp
parentfa4fdb5ca559f8aae4137f8d3b974c14c760360d (diff)
downloademacs-e4920bc99dfcee02c3bb83b46a761b0893f76626.tar.gz
emacs-e4920bc99dfcee02c3bb83b46a761b0893f76626.zip
Spelling fixes.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.102
-rw-r--r--lisp/ChangeLog.124
-rw-r--r--lisp/ChangeLog.33
-rw-r--r--lisp/ChangeLog.82
-rw-r--r--lisp/cedet/ede/files.el2
-rw-r--r--lisp/cedet/ede/proj-shared.el4
-rw-r--r--lisp/cedet/semantic/grammar.el6
-rw-r--r--lisp/cedet/semantic/lex.el4
-rw-r--r--lisp/cedet/semantic/senator.el4
-rw-r--r--lisp/color.el4
-rw-r--r--lisp/follow.el2
-rw-r--r--lisp/gnus/ChangeLog2
-rw-r--r--lisp/gnus/gmm-utils.el2
-rw-r--r--lisp/gnus/gnus-group.el4
-rw-r--r--lisp/gnus/gnus-topic.el2
-rw-r--r--lisp/gnus/mm-decode.el2
-rw-r--r--lisp/gnus/rfc2047.el4
-rw-r--r--lisp/gnus/starttls.el2
-rw-r--r--lisp/help.el2
-rw-r--r--lisp/international/mule.el4
-rw-r--r--lisp/international/titdic-cnv.el66
-rw-r--r--lisp/language/ethio-util.el2
-rw-r--r--lisp/language/tibet-util.el2
-rw-r--r--lisp/language/tibetan.el4
-rw-r--r--lisp/ldefs-boot.el2
-rw-r--r--lisp/mh-e/ChangeLog3
-rw-r--r--lisp/net/eudc-export.el2
-rw-r--r--lisp/net/secrets.el2
-rw-r--r--lisp/net/tramp-gvfs.el4
-rw-r--r--lisp/net/xesam.el2
-rw-r--r--lisp/org/ChangeLog2
-rw-r--r--lisp/printing.el6
-rw-r--r--lisp/progmodes/cperl-mode.el2
-rw-r--r--lisp/vc/ediff-util.el4
-rw-r--r--lisp/w32-fns.el2
35 files changed, 82 insertions, 84 deletions
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index cb1d1af577b..bf6f21cd422 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -5904,7 +5904,7 @@
5904 (mis-)use tramp-current-user as indication, assuming it is set in 5904 (mis-)use tramp-current-user as indication, assuming it is set in
5905 `tramp-completion-handle-file-name-all-completions'. 5905 `tramp-completion-handle-file-name-all-completions'.
5906 (tramp-send-region): Handle the case `tramp-chunksize' is equal 0. 5906 (tramp-send-region): Handle the case `tramp-chunksize' is equal 0.
5907 I did it accidently. Infinite loop ... 5907 I did it accidentally. Infinite loop ...
5908 (tramp-get-device): `tramp-make-tramp-file-name' must not be 5908 (tramp-get-device): `tramp-make-tramp-file-name' must not be
5909 called with NIL path. It fails in case of multi-method. 5909 called with NIL path. It fails in case of multi-method.
5910 (tramp-file-name-for-operation): Apply `expand-file-name' for 5910 (tramp-file-name-for-operation): Apply `expand-file-name' for
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 1660009aba7..7df2b4b7488 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -10695,7 +10695,7 @@
10695 10695
10696 * net/tramp-smb.el (tramp-smb-wait-for-output): Wait always for 10696 * net/tramp-smb.el (tramp-smb-wait-for-output): Wait always for
10697 the prompt. If it returns earlier (when detecting an error 10697 the prompt. If it returns earlier (when detecting an error
10698 message), the rest of the output will merge accidently with the 10698 message), the rest of the output will merge accidentally with the
10699 output of the next command. Reported by M Jared Finder 10699 output of the next command. Reported by M Jared Finder
10700 <jared@hpalace.com>. 10700 <jared@hpalace.com>.
10701 10701
@@ -16181,7 +16181,7 @@
16181 16181
161822005-12-08 Alan Mackenzie <bug-cc-mode@gnu.org> 161822005-12-08 Alan Mackenzie <bug-cc-mode@gnu.org>
16183 16183
16184 * progmodes/cc-awk.el: Move regexps for analysing AWK code to near the 16184 * progmodes/cc-awk.el: Move regexps for analyzing AWK code to near the
16185 start of the file. ^L now separate sections of the file. 16185 start of the file. ^L now separate sections of the file.
16186 (c-awk-non-eol-esc-pair-re, c-awk-blank-or-comment-line-re) 16186 (c-awk-non-eol-esc-pair-re, c-awk-blank-or-comment-line-re)
16187 (c-awk-one-line-possibly-open-string-re) 16187 (c-awk-one-line-possibly-open-string-re)
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 57a9a7b026a..cb39ca5997f 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -9536,7 +9536,7 @@
9536 it@top level. 9536 it@top level.
9537 9537
9538 * texnfo-upd.el (texinfo-incorporate-descriptions): Don't 9538 * texnfo-upd.el (texinfo-incorporate-descriptions): Don't
9539 accidently find a string in the description that is confused for 9539 accidentally find a string in the description that is confused for
9540 a menu item. 9540 a menu item.
9541 9541
95421990-06-01 Robert J. Chassell (bob@wheat-chex) 95421990-06-01 Robert J. Chassell (bob@wheat-chex)
@@ -12454,4 +12454,3 @@ See ChangeLog.2 for earlier changes.
12454 12454
12455 You should have received a copy of the GNU General Public License 12455 You should have received a copy of the GNU General Public License
12456 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 12456 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
12457
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 7aca1b521a2..77ea9fd9d5d 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -530,7 +530,7 @@
530 composition-function-table. 530 composition-function-table.
531 (tibetan-composable-pattern): New variable. 531 (tibetan-composable-pattern): New variable.
532 (tibetan-subjoined-transcription-alist): Change key "R" to "+R". 532 (tibetan-subjoined-transcription-alist): Change key "R" to "+R".
533 (tibetan-precomposition-rule-alist): Move punctuations to 533 (tibetan-precomposition-rule-alist): Move punctuation to
534 tibetan-punctuation-transcription-alist and 534 tibetan-punctuation-transcription-alist and
535 tibetan-obsolete-glyphs. 535 tibetan-obsolete-glyphs.
536 (tibetan-punctuation-transcription-alist): New variable. 536 (tibetan-punctuation-transcription-alist): New variable.
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 6179d304464..f17dfd85fdf 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -249,7 +249,7 @@ Do this whenever a new project is created, as opposed to loaded."
249 "Return a project description object if DIR has a project. 249 "Return a project description object if DIR has a project.
250Optional argument FORCE means to ignore a hash-hit of 'nomatch. 250Optional argument FORCE means to ignore a hash-hit of 'nomatch.
251This depends on an up to date `ede-project-class-files' variable. 251This depends on an up to date `ede-project-class-files' variable.
252Any directory that contains the file .ede-ignore will allways 252Any directory that contains the file .ede-ignore will always
253return nil." 253return nil."
254 (when (not (file-exists-p (expand-file-name ".ede-ignore" dir))) 254 (when (not (file-exists-p (expand-file-name ".ede-ignore" dir)))
255 (let* ((dirtest (expand-file-name dir)) 255 (let* ((dirtest (expand-file-name dir))
diff --git a/lisp/cedet/ede/proj-shared.el b/lisp/cedet/ede/proj-shared.el
index ec514194e33..4e233f56a12 100644
--- a/lisp/cedet/ede/proj-shared.el
+++ b/lisp/cedet/ede/proj-shared.el
@@ -61,7 +61,7 @@ Use ldlibs to add addition libraries.")
61; "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^") 61; "$(CC_SHARED) -shared $(CFLAGS) $(LDFLAGS) -L. -o $@ $^")
62; ) 62; )
63; :commands '("$(C_SHARED_LINK) %s") 63; :commands '("$(C_SHARED_LINK) %s")
64 ;; @TODO - addative modification of autoconf. 64 ;; @TODO - additive modification of autoconf.
65 :autoconf '("AC_PROG_LIBTOOL") 65 :autoconf '("AC_PROG_LIBTOOL")
66 ) 66 )
67 "Compiler for C sourcecode.") 67 "Compiler for C sourcecode.")
@@ -108,7 +108,7 @@ Use ldlibs to add addition libraries.")
108 :variables '(("CXX_SHARED" . "g++") 108 :variables '(("CXX_SHARED" . "g++")
109 ("CXX_SHARED_COMPILE" . 109 ("CXX_SHARED_COMPILE" .
110 "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)")) 110 "$(CXX_SHARED) -shared $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)"))
111 ;; @TODO - addative modification of autoconf. 111 ;; @TODO - additive modification of autoconf.
112 :autoconf '("AC_PROG_LIBTOOL") 112 :autoconf '("AC_PROG_LIBTOOL")
113 ) 113 )
114 "Compiler for C sourcecode.") 114 "Compiler for C sourcecode.")
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 1d1184e534f..98b1ab55c32 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -104,10 +104,10 @@ It ignores whitespaces, newlines and comments."
104 ;; regexp match semicolons inside strings! 104 ;; regexp match semicolons inside strings!
105 semantic-lex-ignore-comments 105 semantic-lex-ignore-comments
106 ;; Must detect prefixed list before punctuation because prefix chars 106 ;; Must detect prefixed list before punctuation because prefix chars
107 ;; are also punctuations! 107 ;; are also punctuation!
108 semantic-grammar-wy--<qlist>-sexp-analyzer 108 semantic-grammar-wy--<qlist>-sexp-analyzer
109 ;; Must detect punctuations after comments because the semicolon can 109 ;; Must detect punctuation after comments because the semicolon can
110 ;; be a punctuation or a comment start! 110 ;; be punctuation or a comment start!
111 semantic-grammar-wy--<punctuation>-string-analyzer 111 semantic-grammar-wy--<punctuation>-string-analyzer
112 semantic-grammar-wy--<block>-block-analyzer 112 semantic-grammar-wy--<block>-block-analyzer
113 semantic-grammar-wy--<sexp>-sexp-analyzer) 113 semantic-grammar-wy--<sexp>-sexp-analyzer)
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index fca367ecb8c..ba43ba657a1 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -165,7 +165,7 @@
165;; 165;;
166;; %type <punctuation> syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string 166;; %type <punctuation> syntax "\\(\\s.\\|\\s$\\|\\s'\\)+" matchdatatype string
167;; 167;;
168;; ;; Some punctuations based on the type defines above 168;; ;; Some punctuation based on the type defines above
169;; 169;;
170;; %token <punctuation> NOT "!" 170;; %token <punctuation> NOT "!"
171;; %token <punctuation> NOTEQ "!=" 171;; %token <punctuation> NOTEQ "!="
@@ -1313,7 +1313,7 @@ and number formats."
1313 1313
1314(define-lex-analyzer semantic-lex-punctuation-type 1314(define-lex-analyzer semantic-lex-punctuation-type
1315 "Detect and create a punctuation type token. 1315 "Detect and create a punctuation type token.
1316Recognized punctuations are defined in the current table of lexical 1316Recognized punctuation is defined in the current table of lexical
1317types, as the value of the `punctuation' token type." 1317types, as the value of the `punctuation' token type."
1318 (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+") 1318 (and (looking-at "\\(\\s.\\|\\s$\\|\\s'\\)+")
1319 (let* ((key (match-string 0)) 1319 (let* ((key (match-string 0))
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 5399d4d5649..b4618d1c18f 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -179,8 +179,8 @@ source."
179 (goto-char (semantic-tag-start tag)) 179 (goto-char (semantic-tag-start tag))
180 (when (re-search-forward (concat 180 (when (re-search-forward (concat
181 ;; The tag name is expected to be 181 ;; The tag name is expected to be
182 ;; between word delimiters, whitespaces, 182 ;; between word delimiters, whitespace,
183 ;; or punctuations. 183 ;; or punctuation.
184 "\\(\\<\\|\\s-+\\|\\s.\\)" 184 "\\(\\<\\|\\s-+\\|\\s.\\)"
185 (regexp-quote name) 185 (regexp-quote name)
186 "\\(\\>\\|\\s-+\\|\\s.\\)") 186 "\\(\\>\\|\\s-+\\|\\s.\\)")
diff --git a/lisp/color.el b/lisp/color.el
index 487e280dd59..96b79a4ace2 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -128,8 +128,8 @@ inclusive."
128RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0, 128RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0,
129inclusive. 129inclusive.
130 130
131Return a list (HUE, SATURATION, LUMINENCE), where HUE is in radians 131Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians
132and both SATURATION and LUMINENCE are between 0.0 and 1.0, 132and both SATURATION and LUMINANCE are between 0.0 and 1.0,
133inclusive." 133inclusive."
134 (let* ((r red) 134 (let* ((r red)
135 (g green) 135 (g green)
diff --git a/lisp/follow.el b/lisp/follow.el
index 72a091e8ce2..3badb381c57 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -98,7 +98,7 @@
98;; (global-set-key [f7] 'follow-delete-other-windows-and-split) 98;; (global-set-key [f7] 'follow-delete-other-windows-and-split)
99 99
100 100
101;; There exist two system variables that control the appearence of 101;; There exist two system variables that control the appearance of
102;; lines wider than the window containing them. The default is to 102;; lines wider than the window containing them. The default is to
103;; truncate long lines whenever a window isn't as wide as the frame. 103;; truncate long lines whenever a window isn't as wide as the frame.
104;; 104;;
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index eed5f921c57..de5f5e0b7c4 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2778,7 +2778,7 @@
27782011-01-28 Lars Ingebrigtsen <larsi@gnus.org> 27782011-01-28 Lars Ingebrigtsen <larsi@gnus.org>
2779 2779
2780 * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active 2780 * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active
2781 data if the group is unactivated. 2781 data if the group is deactivated.
2782 2782
27832011-01-28 Julien Danjou <julien@danjou.info> 27832011-01-28 Julien Danjou <julien@danjou.info>
2784 2784
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index f913ddb5378..3ee72bc5fc6 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -217,7 +217,7 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
217 'static-color 'pseudo-color))))) 217 'static-color 'pseudo-color)))))
218 'gnome 218 'gnome
219 'retro) 219 'retro)
220 "Prefered tool bar style." 220 "Preferred tool bar style."
221 :type '(choice (const :tag "GNOME style" gnome) 221 :type '(choice (const :tag "GNOME style" gnome)
222 (const :tag "Retro look" retro)) 222 (const :tag "Retro look" retro))
223 :group 'gmm) 223 :group 'gmm)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 9d358969062..02c37f22774 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1354,9 +1354,9 @@ if it is a string, only list groups matching REGEXP."
1354 (predicate t) ; We list all groups? 1354 (predicate t) ; We list all groups?
1355 (t 1355 (t
1356 (or 1356 (or
1357 (if (eq unread t) ; Unactivated? 1357 (if (eq unread t) ; Deactivated?
1358 gnus-group-list-inactive-groups 1358 gnus-group-list-inactive-groups
1359 ; We list unactivated 1359 ; We list inactive
1360 (and (numberp unread) (> unread 0))) 1360 (and (numberp unread) (> unread 0)))
1361 ; We list groups with unread articles 1361 ; We list groups with unread articles
1362 (and gnus-list-groups-with-ticked-articles 1362 (and gnus-list-groups-with-ticked-articles
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 17af1a38333..87ca27adcf4 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -582,7 +582,7 @@ articles in the topic and its subtopics."
582 (or gnus-topic-display-empty-topics ;We want empty topics 582 (or gnus-topic-display-empty-topics ;We want empty topics
583 (not (zerop unread)) ;Non-empty 583 (not (zerop unread)) ;Non-empty
584 tick ;Ticked articles 584 tick ;Ticked articles
585 (/= point-max (point-max)))) ;Unactivated groups 585 (/= point-max (point-max)))) ;Inactive groups
586 (gnus-extent-start-open (point)) 586 (gnus-extent-start-open (point))
587 (gnus-topic-insert-topic-line 587 (gnus-topic-insert-topic-line
588 (car type) visiblep 588 (car type) visiblep
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 36c56e0921b..44e2af5b904 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -360,7 +360,7 @@ to:
360 (\"text/html\" \"text/richtext\") 360 (\"text/html\" \"text/richtext\")
361 361
362Adding \"image/.*\" might also be useful. Spammers use it as the 362Adding \"image/.*\" might also be useful. Spammers use it as the
363prefered part of multipart/alternative messages. See also 363preferred part of multipart/alternative messages. See also
364`gnus-buttonized-mime-types', to which adding \"multipart/alternative\" 364`gnus-buttonized-mime-types', to which adding \"multipart/alternative\"
365enables you to choose manually one of two types those mails include." 365enables you to choose manually one of two types those mails include."
366 :type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'. 366 :type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'.
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index feed078034c..f1cb1f69e56 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -586,7 +586,7 @@ should not change this value.")
586 ((>= column rfc2047-encode-max-chars) 586 ((>= column rfc2047-encode-max-chars)
587 (when eword 587 (when eword
588 (cond ((string-match "\n[ \t]+\\'" eword) 588 (cond ((string-match "\n[ \t]+\\'" eword)
589 ;; Reomove a superfluous empty line. 589 ;; Remove a superfluous empty line.
590 (setq eword (substring eword 0 (match-beginning 0)))) 590 (setq eword (substring eword 0 (match-beginning 0))))
591 ((string-match "(+\\'" eword) 591 ((string-match "(+\\'" eword)
592 ;; Break the line before the open parenthesis. 592 ;; Break the line before the open parenthesis.
@@ -639,7 +639,7 @@ should not change this value.")
639 (setq crest " " 639 (setq crest " "
640 eword (concat eword next))) 640 eword (concat eword next)))
641 (when (string-match "\n[ \t]+\\'" eword) 641 (when (string-match "\n[ \t]+\\'" eword)
642 ;; Reomove a superfluous empty line. 642 ;; Remove a superfluous empty line.
643 (setq eword (substring eword 0 (match-beginning 0)))) 643 (setq eword (substring eword 0 (match-beginning 0))))
644 (rfc2047-encode-1 (length crest) (substring string index) 644 (rfc2047-encode-1 (length crest) (substring string index)
645 cs encoder start " " tail 645 cs encoder start " " tail
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index 58dbebf4c5a..af9fd42c127 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -35,7 +35,7 @@
35;; and the second one is Simon Josefsson's starttls.el which uses 35;; and the second one is Simon Josefsson's starttls.el which uses
36;; "gnutls-cli" from GnuTLS. 36;; "gnutls-cli" from GnuTLS.
37;; 37;;
38;; If "starttls" is available, it is prefered by the code over 38;; If "starttls" is available, it is preferred by the code over
39;; "gnutls-cli", for backwards compatibility. Use 39;; "gnutls-cli", for backwards compatibility. Use
40;; `starttls-use-gnutls' to toggle between implementations if you have 40;; `starttls-use-gnutls' to toggle between implementations if you have
41;; both tools installed. It is recommended to use GnuTLS, though, as 41;; both tools installed. It is recommended to use GnuTLS, though, as
diff --git a/lisp/help.el b/lisp/help.el
index 506889c210e..36d49aae9b3 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -969,7 +969,7 @@ This is effective only when Temp Buffer Resize mode is enabled.
969The value is the maximum height (in lines) which 969The value is the maximum height (in lines) which
970`resize-temp-buffer-window' will give to a window displaying a 970`resize-temp-buffer-window' will give to a window displaying a
971temporary buffer. It can also be a function to be called to 971temporary buffer. It can also be a function to be called to
972choose the height for such a buffer. It gets one argumemt, the 972choose the height for such a buffer. It gets one argument, the
973buffer, and should return a positive integer. At the time the 973buffer, and should return a positive integer. At the time the
974function is called, the window to be resized is selected." 974function is called, the window to be resized is selected."
975 :type '(choice integer function) 975 :type '(choice integer function)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 58a08f4506f..d078d98a480 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -703,13 +703,13 @@ If the value is nil, on decoding, don't treat the first two-byte as
703BOM, and on encoding, don't produce BOM bytes. 703BOM, and on encoding, don't produce BOM bytes.
704 704
705If the value is t, on decoding, skip the first two-byte as BOM, and on 705If the value is t, on decoding, skip the first two-byte as BOM, and on
706encoding, produce BOM bytes accoding to the value of `:endian'. 706encoding, produce BOM bytes according to the value of `:endian'.
707 707
708If the value is cons, on decoding, check the first two-byte. If they 708If the value is cons, on decoding, check the first two-byte. If they
709are 0xFE 0xFF, use the car part coding system of the value. If they 709are 0xFE 0xFF, use the car part coding system of the value. If they
710are 0xFF 0xFE, use the cdr part coding system of the value. 710are 0xFF 0xFE, use the cdr part coding system of the value.
711Otherwise, treat them as bytes for a normal character. On encoding, 711Otherwise, treat them as bytes for a normal character. On encoding,
712produce BOM bytes accoding to the value of `:endian'. 712produce BOM bytes according to the value of `:endian'.
713 713
714This attribute has a meaning only when `:coding-type' is `utf-16' or 714This attribute has a meaning only when `:coding-type' is `utf-16' or
715`utf-8'. 715`utf-8'.
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 0ba0b9085b9..6614ac8b416 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -128,11 +128,11 @@ SPC, 1, 2, 3, or 4 specifing a tone (SPC:$(0?v(N(B, 1:$(0M=Vy(B, 2:$(0Dm(N
128\\<quail-translation-docstring>") 128\\<quail-translation-docstring>")
129 129
130 ("chinese-punct-b5" "$(0O:(BB" 130 ("chinese-punct-b5" "$(0O:(BB"
131 "Input method for Chinese punctuations and symbols of Big5 131 "Input method for Chinese punctuation and symbols of Big5
132\(`chinese-big5-1' and `chinese-big5-2').") 132\(`chinese-big5-1' and `chinese-big5-2').")
133 133
134 ("chinese-punct" "$A1j(BG" 134 ("chinese-punct" "$A1j(BG"
135 "Input method for Chinese punctuations and symbols of GB2312 135 "Input method for Chinese punctuation and symbols of GB2312
136\(`chinese-gb2312').") 136\(`chinese-gb2312').")
137 137
138 ("chinese-py-b5" "$(03<(BB" 138 ("chinese-py-b5" "$(03<(BB"
@@ -801,36 +801,36 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
801 (setq dic (sort dic (function (lambda (x y) (string< (car x ) (car y)))))) 801 (setq dic (sort dic (function (lambda (x y) (string< (car x ) (car y))))))
802 (dolist (elt dic) 802 (dolist (elt dic)
803 (insert (format "(%S\t%S)\n" (car elt) (cdr elt)))) 803 (insert (format "(%S\t%S)\n" (car elt) (cdr elt))))
804 (let ((punctuations '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B") 804 (let ((punctuation '((";" "$(0!'!2!"!#!.!/(B" "$(G!'!2!"!#!.!/(B")
805 (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B") 805 (":" "$(0!(!+!3!%!$!&!0!1(B" "$(G!(!+!3!%!$!&!0!1(B")
806 ("'" "$(0!e!d(B" "$(G!e!d(B") 806 ("'" "$(0!e!d(B" "$(G!e!d(B")
807 ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B") 807 ("\"" "$(0!g!f!h!i!q(B" "$(G!g!f!h!i!q(B")
808 ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B") 808 ("\\" "$(0"`"b#M(B" "$(G"`"b#M(B")
809 ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B") 809 ("|" "$(0!6!8!:"^(B" "$(G!6!8!:"^(B")
810 ("/" "$(0"_"a#L(B" "$(G"_"a#L(B") 810 ("/" "$(0"_"a#L(B" "$(G"_"a#L(B")
811 ("?" "$(0!)!4(B" "$(G!)!4(B") 811 ("?" "$(0!)!4(B" "$(G!)!4(B")
812 ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B") 812 ("<" "$(0!R"6"A!T"H(B" "$(G!R"6"A!T"H(B")
813 (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B") 813 (">" "$(0!S"7"B!U(B" "$(G!S"7"B!U(B")
814 ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B") 814 ("[" "$(0!F!J!b!H!L!V!Z!X!\(B" "$(G!F!J!b!H!L!V!Z!X!\(B")
815 ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B") 815 ("]" "$(0!G!K!c!I!M!W![!Y!](B" "$(G!G!K!c!I!M!W![!Y!](B")
816 ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ") 816 ("{" "$(0!B!`!D(B " "$(G!B!`!D(B ")
817 ("}" "$(0!C!a!E(B" "$(G!C!a!E(B") 817 ("}" "$(0!C!a!E(B" "$(G!C!a!E(B")
818 ("`" "$(0!j!k(B" "$(G!j!k(B") 818 ("`" "$(0!j!k(B" "$(G!j!k(B")
819 ("~" "$(0"D"+",!<!=(B" "$(G"D"+",!<!=(B") 819 ("~" "$(0"D"+",!<!=(B" "$(G"D"+",!<!=(B")
820 ("!" "$(0!*!5(B" "$(G!*!5(B") 820 ("!" "$(0!*!5(B" "$(G!*!5(B")
821 ("@" "$(0"i"n(B" "$(G"i"n(B") 821 ("@" "$(0"i"n(B" "$(G"i"n(B")
822 ("#" "$(0!l"-(B" "$(G!l"-(B") 822 ("#" "$(0!l"-(B" "$(G!l"-(B")
823 ("$" "$(0"c"l(B" "$(G"c"l(B") 823 ("$" "$(0"c"l(B" "$(G"c"l(B")
824 ("%" "$(0"h"m(B" "$(G"h"m(B") 824 ("%" "$(0"h"m(B" "$(G"h"m(B")
825 ("&" "$(0!m".(B" "$(G!m".(B") 825 ("&" "$(0!m".(B" "$(G!m".(B")
826 ("*" "$(0!n"/!o!w!x(B" "$(G!n"/!o!w!x(B") 826 ("*" "$(0!n"/!o!w!x(B" "$(G!n"/!o!w!x(B")
827 ("(" "$(0!>!^!@(B" "$(G!>!^!@(B") 827 ("(" "$(0!>!^!@(B" "$(G!>!^!@(B")
828 (")" "$(0!?!_!A(B" "$(G!?!_!A(B") 828 (")" "$(0!?!_!A(B" "$(G!?!_!A(B")
829 ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B") 829 ("-" "$(0!7!9"#"$"1"@(B" "$(G!7!9"#"$"1"@(B")
830 ("_" "$(0"%"&(B" "$(G"%"&(B") 830 ("_" "$(0"%"&(B" "$(G"%"&(B")
831 ("=" "$(0"8"C(B" "$(G"8"C(B") 831 ("=" "$(0"8"C(B" "$(G"8"C(B")
832 ("+" "$(0"0"?(B" "$(G"0"?(B")))) 832 ("+" "$(0"0"?(B" "$(G"0"?(B"))))
833 (dolist (elt punctuations) 833 (dolist (elt punctuation)
834 (insert (format "(%S %S)\n" (concat "z" (car elt)) 834 (insert (format "(%S %S)\n" (concat "z" (car elt))
835 (if big5-p (nth 1 elt) (nth 2 elt)))))) 835 (if big5-p (nth 1 elt) (nth 2 elt))))))
836 (insert ")\n"))) 836 (insert ")\n")))
@@ -1017,7 +1017,7 @@ To input words of more than three letters, you type 4 keys, initials
1017of the first three letters and the last letter. For instance, 1017of the first three letters and the last letter. For instance,
1018\"bjdt\" inputs $A11>)5gJSL((B. 1018\"bjdt\" inputs $A11>)5gJSL((B.
1019 1019
1020To input symbols and punctuations, type `/' followed by one of `a' to 1020To input symbols and punctuation, type `/' followed by one of `a' to
1021`z', then select one of the candidates.")) 1021`z', then select one of the candidates."))
1022 (insert " '((\"\C-?\" . quail-delete-last-char) 1022 (insert " '((\"\C-?\" . quail-delete-last-char)
1023 (\".\" . quail-next-translation) 1023 (\".\" . quail-next-translation)
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 444f4d519da..1d93d981f8e 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -802,7 +802,7 @@ The 2nd and 3rd arguments BEGIN and END specify the region."
802 (forward-char 1) 802 (forward-char 1)
803 (insert "}"))) 803 (insert "}")))
804 804
805 ;; Special Ethiopic punctuations. 805 ;; Special Ethiopic punctuation.
806 (goto-char (point-min)) 806 (goto-char (point-min))
807 (while (re-search-forward "\\ce[»\\.\\?]\\|«\\ce" nil t) 807 (while (re-search-forward "\\ce[»\\.\\?]\\|«\\ce" nil t)
808 (cond 808 (cond
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index 8458974e753..fd23bbb6d54 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -27,7 +27,7 @@
27 27
28;;; History: 28;;; History:
29;; 1997.03.13 Modification in treatment of text properties; 29;; 1997.03.13 Modification in treatment of text properties;
30;; Support for some special signs and punctuations. 30;; Support for some special signs and punctuation.
31;; 1999.10.25 Modification for a new composition way by K.Handa. 31;; 1999.10.25 Modification for a new composition way by K.Handa.
32 32
33;;; Commentary: 33;;; Commentary:
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index c80b22c696d..1607868dea5 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -30,7 +30,7 @@
30 30
31;;; History: 31;;; History:
32 32
33;; 1997.03.13 Modification for special signs and punctuations. 33;; 1997.03.13 Modification for special signs and punctuation.
34 34
35;;; Commentary: 35;;; Commentary:
36 36
@@ -44,7 +44,7 @@
44;;; 44;;;
45;;; 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F 45;;; 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
46;;;2120 // $(7!!(B $(7!"(B $(7!#(B $(7!$(B $(7!%(B $(7!&(B $(7!'(B $(7!((B $(7!)(B $(7!*(B $(7!+(B $(7!,(B $(7!-(B $(7!.(B $(7!/(B ; obsolete glyphs (2123-5) 46;;;2120 // $(7!!(B $(7!"(B $(7!#(B $(7!$(B $(7!%(B $(7!&(B $(7!'(B $(7!((B $(7!)(B $(7!*(B $(7!+(B $(7!,(B $(7!-(B $(7!.(B $(7!/(B ; obsolete glyphs (2123-5)
47;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuations, 47;;;2130 $(7!0(B $(7!1(B $(7!2(B $(7!3(B $(7!4(B $(7!5(B $(7!6(B $(7!7(B $(7!8(B $(7!9(B $(7!:(B $(7!;(B $(7!<(B $(7!=(B $(7!>(B $(7!?(B ; Punctuation,
48;;;2140 $(7!@(B $(7!A(B $(7!B(B $(7!C(B $(7!D(B $(7!E(B $(7!F(B $(7!G(B $(7!H(B $(7!I(B $(7!J(B $(7!K(B $(7!L(B $(7!M(B $(7!N(B $(7!O(B ; Digits and 48;;;2140 $(7!@(B $(7!A(B $(7!B(B $(7!C(B $(7!D(B $(7!E(B $(7!F(B $(7!G(B $(7!H(B $(7!I(B $(7!J(B $(7!K(B $(7!L(B $(7!M(B $(7!N(B $(7!O(B ; Digits and
49;;;2150 $(7!P(B $(7!Q(B $(7!R(B $(7!S(B $(7!T(B $(7!U(B $(7!V(B $(7!W(B $(7!X(B $(7!Y(B $(7!Z(B $(7![(B $(7!\(B $(7!](B $(7!^(B $(7!_(B ; Special signs. 49;;;2150 $(7!P(B $(7!Q(B $(7!R(B $(7!S(B $(7!T(B $(7!U(B $(7!V(B $(7!W(B $(7!X(B $(7!Y(B $(7!Z(B $(7![(B $(7!\(B $(7!](B $(7!^(B $(7!_(B ; Special signs.
50;;;2160 $(7!`(B $(7!a(B $(7!b(B $(7!c(B $(7!d(B $(7!e(B $(7!f(B $(7!g(B $(7!h(B $(7!i(B $(7!j(B $(7!k(B $(7!l(B $(7!m(B $(7!n(B $(7!o(B ; 50;;;2160 $(7!`(B $(7!a(B $(7!b(B $(7!c(B $(7!d(B $(7!e(B $(7!f(B $(7!g(B $(7!h(B $(7!i(B $(7!j(B $(7!k(B $(7!l(B $(7!m(B $(7!n(B $(7!o(B ;
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index f1d25158ce2..b0d08217fc1 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -818,7 +818,7 @@ BULLET: A character at the end of the ITEM PREFIX, it must be one of
818 `allout-distinctive-bullets-string'. When creating a TOPIC, 818 `allout-distinctive-bullets-string'. When creating a TOPIC,
819 plain BULLETs are by default used, according to the DEPTH of the 819 plain BULLETs are by default used, according to the DEPTH of the
820 TOPIC. Choice among the distinctive BULLETs is offered when you 820 TOPIC. Choice among the distinctive BULLETs is offered when you
821 provide a universal argugment (\\[universal-argument]) to the 821 provide a universal argument (\\[universal-argument]) to the
822 TOPIC creation command, or when explictly rebulleting a TOPIC. The 822 TOPIC creation command, or when explictly rebulleting a TOPIC. The
823 significance of the various distinctive bullets is purely by 823 significance of the various distinctive bullets is purely by
824 convention. See the documentation for the above bullet strings for 824 convention. See the documentation for the above bullet strings for
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 6bdd96c0fcc..02e531120be 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -2674,7 +2674,7 @@
2674 2674
2675 Follow MH-E Developers Guide conventions. Use `' quotes for Help 2675 Follow MH-E Developers Guide conventions. Use `' quotes for Help
2676 hyperlinks such as symbols, Info nodes, or URLs. Use \" quotes for 2676 hyperlinks such as symbols, Info nodes, or URLs. Use \" quotes for
2677 everything else. Otherwise, you can accidently get links to 2677 everything else. Otherwise, you can accidentally get links to
2678 nonsense symbols. 2678 nonsense symbols.
2679 2679
26802005-12-22 Bill Wohler <wohler@newt.com> 26802005-12-22 Bill Wohler <wohler@newt.com>
@@ -3456,4 +3456,3 @@
3456;; sentence-end-double-space: nil 3456;; sentence-end-double-space: nil
3457;; add-log-time-zone-rule: t 3457;; add-log-time-zone-rule: t
3458;; End: 3458;; End:
3459
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index 87ff0b4060f..af8bc084b57 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -128,7 +128,7 @@ LOCATION is used as the address location for bbdb."
128 zip city state) 128 zip city state)
129 (setq addr-components (nreverse addr-components)) 129 (setq addr-components (nreverse addr-components))
130 ;; If not containing the zip code the last line is supposed to contain a 130 ;; If not containing the zip code the last line is supposed to contain a
131 ;; country name and the addres is supposed to be in european style 131 ;; country name and the address is supposed to be in european style
132 (if (not (string-match "[0-9][0-9][0-9]" last1)) 132 (if (not (string-match "[0-9][0-9][0-9]" last1))
133 (progn 133 (progn
134 (setq state last1) 134 (setq state last1)
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 7e0eaff1dce..1a48e8863f1 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -729,7 +729,7 @@ to their attributes."
729 ;; Create the search buffer. 729 ;; Create the search buffer.
730 (with-current-buffer (get-buffer-create "*Secrets*") 730 (with-current-buffer (get-buffer-create "*Secrets*")
731 (switch-to-buffer-other-window (current-buffer)) 731 (switch-to-buffer-other-window (current-buffer))
732 ;; Inialize buffer with `secrets-mode'. 732 ;; Initialize buffer with `secrets-mode'.
733 (secrets-mode) 733 (secrets-mode)
734 (secrets-show-collections)))) 734 (secrets-show-collections))))
735 735
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index fda88351253..df841bade79 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -996,7 +996,7 @@ ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"."
996 (let ((signal-name (dbus-event-member-name last-input-event)) 996 (let ((signal-name (dbus-event-member-name last-input-event))
997 (elt mount-info)) 997 (elt mount-info))
998 ;; Jump over the first elements of the mount info. Since there 998 ;; Jump over the first elements of the mount info. Since there
999 ;; were changes in the antries, we cannot access dedicated 999 ;; were changes in the entries, we cannot access dedicated
1000 ;; elements. 1000 ;; elements.
1001 (while (stringp (car elt)) (setq elt (cdr elt))) 1001 (while (stringp (car elt)) (setq elt (cdr elt)))
1002 (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) 1002 (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt)))
@@ -1066,7 +1066,7 @@ ADDRESS can have the form \"xx:xx:xx:xx:xx:xx\" or \"[xx:xx:xx:xx:xx:xx]\"."
1066 tramp-gvfs-interface-mounttracker "listMounts")) 1066 tramp-gvfs-interface-mounttracker "listMounts"))
1067 nil) 1067 nil)
1068 ;; Jump over the first elements of the mount info. Since there 1068 ;; Jump over the first elements of the mount info. Since there
1069 ;; were changes in the antries, we cannot access dedicated 1069 ;; were changes in the entries, we cannot access dedicated
1070 ;; elements. 1070 ;; elements.
1071 (while (stringp (car elt)) (setq elt (cdr elt))) 1071 (while (stringp (car elt)) (setq elt (cdr elt)))
1072 (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt))) 1072 (let* ((fuse-mountpoint (dbus-byte-array-to-string (cadr elt)))
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index 907c99a7e86..ab817a43885 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -820,7 +820,7 @@ search, is returned."
820 (with-current-buffer 820 (with-current-buffer
821 (generate-new-buffer (xesam-buffer-name service search)) 821 (generate-new-buffer (xesam-buffer-name service search))
822 (switch-to-buffer-other-window (current-buffer)) 822 (switch-to-buffer-other-window (current-buffer))
823 ;; Inialize buffer with `xesam-mode'. `xesam-vendor' must be 823 ;; Initialize buffer with `xesam-mode'. `xesam-vendor' must be
824 ;; set before calling `xesam-mode', because we want to give the 824 ;; set before calling `xesam-mode', because we want to give the
825 ;; hook functions a chance to identify their search engine. 825 ;; hook functions a chance to identify their search engine.
826 (setq xesam-vendor (xesam-get-cached-property engine "vendor.id")) 826 (setq xesam-vendor (xesam-get-cached-property engine "vendor.id"))
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 94346a4944a..1c8a3e72956 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -17596,7 +17596,7 @@
175962008-06-17 Carsten Dominik <dominik@science.uva.nl> 175962008-06-17 Carsten Dominik <dominik@science.uva.nl>
17597 17597
17598 * org.el (org-schedule, org-deadline): Protect scheduled and 17598 * org.el (org-schedule, org-deadline): Protect scheduled and
17599 deadline tasks against changes that accidently remove the 17599 deadline tasks against changes that accidentally remove the
17600 repeater. Also show a message with the new date when done. 17600 repeater. Also show a message with the new date when done.
17601 17601
176022008-06-17 Carsten Dominik <dominik@science.uva.nl> 176022008-06-17 Carsten Dominik <dominik@science.uva.nl>
diff --git a/lisp/printing.el b/lisp/printing.el
index d6c67cc68a6..2dea24149a7 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -547,7 +547,7 @@ Please send all bug fixes and enhancements to
547;; `pr-auto-region' Non-nil means region is automagically detected. 547;; `pr-auto-region' Non-nil means region is automagically detected.
548;; 548;;
549;; `pr-auto-mode' Non-nil means major-mode specific printing is 549;; `pr-auto-mode' Non-nil means major-mode specific printing is
550;; prefered over normal printing. 550;; preferred over normal printing.
551;; 551;;
552;; `pr-mode-alist' Specify an alist for a major-mode and printing 552;; `pr-mode-alist' Specify an alist for a major-mode and printing
553;; function. 553;; function.
@@ -2426,7 +2426,7 @@ marked instead of all buffer."
2426 2426
2427 2427
2428(defcustom pr-auto-mode t 2428(defcustom pr-auto-mode t
2429 "Non-nil means major-mode specific printing is prefered over normal printing. 2429 "Non-nil means major-mode specific printing is preferred over normal printing.
2430 2430
2431That is, if current major-mode is declared in `pr-mode-alist', the `*-buffer*' 2431That is, if current major-mode is declared in `pr-mode-alist', the `*-buffer*'
2432and `*-region*' commands will behave like `*-mode*' commands; otherwise, 2432and `*-region*' commands will behave like `*-mode*' commands; otherwise,
@@ -5458,7 +5458,7 @@ If menu binding was not done, calls `pr-menu-bind'."
5458 5458
5459 5459
5460(defun pr-toggle-mode-menu (&optional no-menu) 5460(defun pr-toggle-mode-menu (&optional no-menu)
5461 "Toggle whether major-mode specific printing is prefered over normal printing." 5461 "Toggle whether major-mode specific printing is preferred over normal printing."
5462 (interactive) 5462 (interactive)
5463 (pr-toggle 'pr-auto-mode "Auto mode" 5463 (pr-toggle 'pr-auto-mode "Auto mode"
5464 'printing 1 12 'toggle nil no-menu)) 5464 'printing 1 12 'toggle nil no-menu))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 9352725384b..07359539256 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -7650,7 +7650,7 @@ $~ The name of the current report format.
7650... &= ... Bitwise and assignment. 7650... &= ... Bitwise and assignment.
7651... * ... Multiplication. 7651... * ... Multiplication.
7652... ** ... Exponentiation. 7652... ** ... Exponentiation.
7653*NAME Glob: all objects refered by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2. 7653*NAME Glob: all objects referred by NAME. *NAM1 = *NAM2 aliases NAM1 to NAM2.
7654&NAME(arg0, ...) Subroutine call. Arguments go to @_. 7654&NAME(arg0, ...) Subroutine call. Arguments go to @_.
7655... + ... Addition. +EXPR Makes EXPR into scalar context. 7655... + ... Addition. +EXPR Makes EXPR into scalar context.
7656++ Auto-increment (magical on strings). ++EXPR EXPR++ 7656++ Auto-increment (magical on strings). ++EXPR EXPR++
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 30df073df12..b1c6e367ef7 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -3811,7 +3811,7 @@ Ediff Control Panel to restore highlighting."
3811 ;; later, and nconc above will break it. Either this or use slow 3811 ;; later, and nconc above will break it. Either this or use slow
3812 ;; append instead of nconc 3812 ;; append instead of nconc
3813 (selected-buffers (ediff-get-selected-buffers)) 3813 (selected-buffers (ediff-get-selected-buffers))
3814 (prefered-buffer (car all-buffers)) 3814 (preferred-buffer (car all-buffers))
3815 visible-dired-buffers 3815 visible-dired-buffers
3816 (excl-buff-name-list 3816 (excl-buff-name-list
3817 (mapcar 3817 (mapcar
@@ -3841,7 +3841,7 @@ Ediff Control Panel to restore highlighting."
3841 (cond ((member (buffer-name x) excl-buff-name-list) nil) 3841 (cond ((member (buffer-name x) excl-buff-name-list) nil)
3842 ((memq x selected-buffers) x) 3842 ((memq x selected-buffers) x)
3843 ((not (ediff-get-visible-buffer-window x)) nil) 3843 ((not (ediff-get-visible-buffer-window x)) nil)
3844 ((eq x prefered-buffer) x) 3844 ((eq x preferred-buffer) x)
3845 ;; if prev selected buffer is dired, look only at 3845 ;; if prev selected buffer is dired, look only at
3846 ;; dired. 3846 ;; dired.
3847 ((eq use-dired-major-mode 'yes) 3847 ((eq use-dired-major-mode 'yes)
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 20361d32450..1f54b8577c3 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -384,7 +384,7 @@ bit output with no translation."
384;; ;; If Unicode Windows charset is not defined, use ansi fonts. 384;; ;; If Unicode Windows charset is not defined, use ansi fonts.
385;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) 385;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
386 386
387;; Prefered names 387;; Preferred names
388(w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950) 388(w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950)
389(w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936) 389(w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936)
390(w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932) 390(w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932)