aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJoakim Verona2013-03-06 00:04:01 +0100
committerJoakim Verona2013-03-06 00:04:01 +0100
commit79157e99328fb1d835985dfa89fc2a2fa427d077 (patch)
treeac0e5a6a03089e3d6352cb3311510cfac0b7d051 /lisp
parent15cb771195328913a9c24467db7e373acb92a769 (diff)
parent707431575aef93ac3e9923d450a6cbf18192c933 (diff)
downloademacs-79157e99328fb1d835985dfa89fc2a2fa427d077.tar.gz
emacs-79157e99328fb1d835985dfa89fc2a2fa427d077.zip
auto upstream
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog19
-rw-r--r--lisp/battery.el4
-rw-r--r--lisp/filesets.el6
-rw-r--r--lisp/gnus/ChangeLog.118
-rw-r--r--lisp/gnus/deuglify.el4
-rw-r--r--lisp/gnus/gnus-delay.el4
-rw-r--r--lisp/gnus/gnus-spec.el8
-rw-r--r--lisp/gnus/gnus-sum.el6
-rw-r--r--lisp/gnus/html2text.el6
-rw-r--r--lisp/gnus/message.el4
-rw-r--r--lisp/gnus/mm-decode.el4
-rw-r--r--lisp/gnus/mml1991.el4
-rw-r--r--lisp/gnus/nnir.el4
-rw-r--r--lisp/gnus/shr.el8
-rw-r--r--lisp/gnus/utf7.el6
-rw-r--r--lisp/international/iso-cvt.el1222
-rw-r--r--lisp/international/iso-transl.el294
-rw-r--r--lisp/language/romanian.el4
-rw-r--r--lisp/mh-e/ChangeLog.16
-rw-r--r--lisp/minibuffer.el36
-rw-r--r--lisp/net/eudc-bob.el4
-rw-r--r--lisp/net/eudc-export.el4
-rw-r--r--lisp/net/eudc-hotlist.el4
-rw-r--r--lisp/net/eudc-vars.el4
-rw-r--r--lisp/net/eudc.el4
-rw-r--r--lisp/net/eudcb-bbdb.el4
-rw-r--r--lisp/net/eudcb-ldap.el4
-rw-r--r--lisp/net/eudcb-ph.el4
-rw-r--r--lisp/net/tramp-compat.el41
-rw-r--r--lisp/obsolete/iso-insert.el194
-rw-r--r--lisp/org/org-freemind.el3
-rw-r--r--lisp/play/bubbles.el4
-rw-r--r--lisp/play/handwrite.el20
-rw-r--r--lisp/progmodes/cc-engine.el24
-rw-r--r--lisp/progmodes/cc-langs.el4
-rw-r--r--lisp/progmodes/hideshow.el4
-rw-r--r--lisp/progmodes/prolog.el6
-rw-r--r--lisp/progmodes/sh-script.el2
-rw-r--r--lisp/ruler-mode.el10
-rw-r--r--lisp/textmodes/conf-mode.el4
-rw-r--r--lisp/textmodes/po.el4
-rw-r--r--lisp/textmodes/tildify.el4
-rw-r--r--lisp/wdired.el4
43 files changed, 1031 insertions, 996 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4cf18ebb1f6..ac56cd8ba79 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
12013-03-05 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-compat.el (tramp-compat-delete-directory): Implement
4 TRASH argument.
5
62013-03-05 Dmitry Gutov <dgutov@yandex.ru>
7
8 Keep pre-existing highlighting in completion candidates (Bug#13250).
9 * minibuffer.el (completions-first-difference): State that the
10 face is "added" in the docstring.
11 (completions-common-part): Same. And don't inherit from default.
12 (completion-hilit-commonality): Prepend 'completions-common-part
13 and 'completion-first-difference faces to the 'face property,
14 instead of replacing the value(s).
15 (completion--insert-strings): Same with 'completions-annotations face.
16 (completion-hilit-commonality): Use 'face instead of
17 'font-lock-face, because it gets priority if the completion
18 strings already have 'face set.
19
12013-03-04 Alan Mackenzie <acm@muc.de> 202013-03-04 Alan Mackenzie <acm@muc.de>
2 21
3 Replace `last-command-event' by `last-command-char' in XEmacs. 22 Replace `last-command-event' by `last-command-char' in XEmacs.
diff --git a/lisp/battery.el b/lisp/battery.el
index 98ba7d1b631..d4e4d8b3a31 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,4 +1,4 @@
1;;; battery.el --- display battery status information -*- coding: iso-8859-1 -*- 1;;; battery.el --- display battery status information -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1997-1998, 2000-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1997-1998, 2000-2013 Free Software Foundation, Inc.
4 4
@@ -116,7 +116,7 @@ string are substituted as defined by the current value of the variable
116 116
117(defcustom battery-mode-line-format 117(defcustom battery-mode-line-format
118 (cond ((eq battery-status-function 'battery-linux-proc-acpi) 118 (cond ((eq battery-status-function 'battery-linux-proc-acpi)
119 "[%b%p%%,%d°C]") 119 "[%b%p%%,%d°C]")
120 (battery-status-function 120 (battery-status-function
121 "[%b%p%%]")) 121 "[%b%p%%]"))
122 "Control string formatting the string to display in the mode line. 122 "Control string formatting the string to display in the mode line.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 62ab7423f67..978512bd3a4 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1,4 +1,4 @@
1;;; filesets.el --- handle group of files 1;;; filesets.el --- handle group of files -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 2002-2013 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
4 4
@@ -805,8 +805,8 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these:
805 (:match-number 2) 805 (:match-number 2)
806 (:get-file-name (lambda (master file) 806 (:get-file-name (lambda (master file)
807 (filesets-which-file master file load-path)))))) 807 (filesets-which-file master file load-path))))))
808 ("^\\([A-ZÄÖÜ][a-zäöüß]+\\([A-ZÄÖÜ][a-zäöüß]+\\)+\\)$" t 808 ("^\\([A-ZÄÖÜ][a-zäöüß]+\\([A-ZÄÖÜ][a-zäöüß]+\\)+\\)$" t
809 (((:pattern "\\<\\([A-ZÄÖÜ][a-zäöüß]+\\([A-ZÄÖÜ][a-zäöüß]+\\)+\\)\\>") 809 (((:pattern "\\<\\([A-ZÄÖÜ][a-zäöüß]+\\([A-ZÄÖÜ][a-zäöüß]+\\)+\\)\\>")
810 (:scan-depth 5) 810 (:scan-depth 5)
811 (:stubp (lambda (a b) (not (filesets-files-in-same-directory-p a b)))) 811 (:stubp (lambda (a b) (not (filesets-files-in-same-directory-p a b))))
812 (:case-sensitive t) 812 (:case-sensitive t)
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index 34533f31bff..9043a23361e 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -452,7 +452,7 @@
452 * gnus-sum.el (gnus-remove-thread): Didn't work with sparse 452 * gnus-sum.el (gnus-remove-thread): Didn't work with sparse
453 threads. 453 threads.
454 454
4551998-08-14 François Pinard <pinard@iro.umontreal.ca> 4551998-08-14 François Pinard <pinard@iro.umontreal.ca>
456 456
457 * nndoc.el (nndoc-generate-mime-parts-head): Use original Subject, 457 * nndoc.el (nndoc-generate-mime-parts-head): Use original Subject,
458 Message-ID, and References in fully blown articles. 458 Message-ID, and References in fully blown articles.
@@ -619,7 +619,7 @@
619 619
620 * gnus.el: Gnus v5.6.31 is released. 620 * gnus.el: Gnus v5.6.31 is released.
621 621
6221998-08-09 François Pinard <pinard@iro.umontreal.ca> 6221998-08-09 François Pinard <pinard@iro.umontreal.ca>
623 623
624 * nndoc.el: Split MIME multipart messages, maybe recursively. 624 * nndoc.el: Split MIME multipart messages, maybe recursively.
625 (nndoc-mime-parts-type-p, nndoc-transform-mime-parts, 625 (nndoc-mime-parts-type-p, nndoc-transform-mime-parts,
@@ -760,7 +760,7 @@
760 * gnus-group.el (gnus-group-read-ephemeral-group): Make the server 760 * gnus-group.el (gnus-group-read-ephemeral-group): Make the server
761 unique. 761 unique.
762 762
7631998-07-28 François Pinard <pinard@iro.umontreal.ca> 7631998-07-28 François Pinard <pinard@iro.umontreal.ca>
764 764
765 * gnus-uu.el (gnus-uu-reginize-string): Consider the number of 765 * gnus-uu.el (gnus-uu-reginize-string): Consider the number of
766 parts as part of the fixed subject, instead of a wild quantity. 766 parts as part of the fixed subject, instead of a wild quantity.
@@ -943,7 +943,7 @@
943 943
944 * nntp.el (nntp-server-opened-hook): Doc change. 944 * nntp.el (nntp-server-opened-hook): Doc change.
945 945
9461998-07-10 François Pinard <pinard@iro.umontreal.ca> 9461998-07-10 François Pinard <pinard@iro.umontreal.ca>
947 947
948 * gnus-sum.el (gnus-summary-respool-trace): New command and 948 * gnus-sum.el (gnus-summary-respool-trace): New command and
949 keystroke. 949 keystroke.
@@ -1003,7 +1003,7 @@
1003 * nntp.el (nntp-record-command): Give more precise time info. 1003 * nntp.el (nntp-record-command): Give more precise time info.
1004 (nntp-next-result-arrived-p): Look for the end of error lines. 1004 (nntp-next-result-arrived-p): Look for the end of error lines.
1005 1005
10061998-07-01 François Pinard <pinard@iro.umontreal.ca> 10061998-07-01 François Pinard <pinard@iro.umontreal.ca>
1007 1007
1008 * gnus-util.el (gnus-delete-if): Would do the opposite. 1008 * gnus-util.el (gnus-delete-if): Would do the opposite.
1009 1009
@@ -2016,7 +2016,7 @@
2016 * gnus-picon.el (gnus-picons-display-x-face): `buf' -- unbound 2016 * gnus-picon.el (gnus-picons-display-x-face): `buf' -- unbound
2017 var. 2017 var.
2018 2018
20191998-02-28 François Pinard <pinard@iro.umontreal.ca> 20191998-02-28 François Pinard <pinard@iro.umontreal.ca>
2020 2020
2021 * gnus: configure'd. 2021 * gnus: configure'd.
2022 2022
@@ -2370,7 +2370,7 @@
2370 2370
2371 * gnus-sum.el (gnus-summary-exit): Call purging function. 2371 * gnus-sum.el (gnus-summary-exit): Call purging function.
2372 2372
23731998-02-13 François Pinard <pinard@iro.umontreal.ca> 23731998-02-13 François Pinard <pinard@iro.umontreal.ca>
2374 2374
2375 * nnmail.el (nnmail-get-new-mail): Don't clear split-history. 2375 * nnmail.el (nnmail-get-new-mail): Don't clear split-history.
2376 (nnmail-purge-split-history): New function. 2376 (nnmail-purge-split-history): New function.
@@ -3724,3 +3724,7 @@
3724 3724
3725 You should have received a copy of the GNU General Public License 3725 You should have received a copy of the GNU General Public License
3726 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 3726 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
3727
3728;; Local Variables:
3729;; coding: utf-8
3730;; End:
diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el
index 8ef89a9e56d..36e91980ba2 100644
--- a/lisp/gnus/deuglify.el
+++ b/lisp/gnus/deuglify.el
@@ -270,7 +270,7 @@
270 :group 'gnus-outlook-deuglify) 270 :group 'gnus-outlook-deuglify)
271 271
272(defcustom gnus-outlook-deuglify-attrib-verb-regexp 272(defcustom gnus-outlook-deuglify-attrib-verb-regexp
273 "wrote\\|writes\\|says\\|schrieb\\|schreibt\\|meinte\\|skrev\\|a écrit\\|schreef\\|escribió" 273 "wrote\\|writes\\|says\\|schrieb\\|schreibt\\|meinte\\|skrev\\|a écrit\\|schreef\\|escribió"
274 "Regular expression matching the verb used in an attribution line." 274 "Regular expression matching the verb used in an attribution line."
275 :version "22.1" 275 :version "22.1"
276 :type 'string 276 :type 'string
@@ -472,7 +472,7 @@ NODISPLAY is non-nil, don't redisplay the article buffer."
472(provide 'deuglify) 472(provide 'deuglify)
473 473
474;; Local Variables: 474;; Local Variables:
475;; coding: iso-8859-1 475;; coding: utf-8
476;; End: 476;; End:
477 477
478;;; deuglify.el ends here 478;;; deuglify.el ends here
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index 5c14ffcfbdf..921d24109c2 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -2,7 +2,7 @@
2 2
3;; Copyright (C) 2001-2013 Free Software Foundation, Inc. 3;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
4 4
5;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> 5;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
6;; Keywords: mail, news, extensions 6;; Keywords: mail, news, extensions
7 7
8;; This file is part of GNU Emacs. 8;; This file is part of GNU Emacs.
@@ -186,7 +186,7 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil."
186(provide 'gnus-delay) 186(provide 'gnus-delay)
187 187
188;; Local Variables: 188;; Local Variables:
189;; coding: iso-8859-1 189;; coding: utf-8
190;; End: 190;; End:
191 191
192;;; gnus-delay.el ends here 192;;; gnus-delay.el ends here
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 446e8260203..2606b8860af 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -418,7 +418,7 @@ characters when given a pad value."
418 ;; them will have the balloon-help text property. 418 ;; them will have the balloon-help text property.
419 (let ((case-fold-search nil)) 419 (let ((case-fold-search nil))
420 (if (string-match 420 (if (string-match
421 "\\`\\(.*\\)%[0-9]?[{(«]\\(.*\\)%[0-9]?[»})]\\(.*\n?\\)\\'\\|%[-0-9]*=\\|%[-0-9]*\\*" 421 "\\`\\(.*\\)%[0-9]?[{(«]\\(.*\\)%[0-9]?[»})]\\(.*\n?\\)\\'\\|%[-0-9]*=\\|%[-0-9]*\\*"
422 format) 422 format)
423 (gnus-parse-complex-format format spec-alist) 423 (gnus-parse-complex-format format spec-alist)
424 ;; This is a simple format. 424 ;; This is a simple format.
@@ -435,13 +435,13 @@ characters when given a pad value."
435 (goto-char (point-min)) 435 (goto-char (point-min))
436 (insert "(\"") 436 (insert "(\"")
437 ;; Convert all font specs into font spec lists. 437 ;; Convert all font specs into font spec lists.
438 (while (re-search-forward "%\\([0-9]+\\)?\\([«»{}()]\\)" nil t) 438 (while (re-search-forward "%\\([0-9]+\\)?\\([«»{}()]\\)" nil t)
439 (let ((number (if (match-beginning 1) 439 (let ((number (if (match-beginning 1)
440 (match-string 1) "0")) 440 (match-string 1) "0"))
441 (delim (aref (match-string 2) 0))) 441 (delim (aref (match-string 2) 0)))
442 (if (or (= delim ?\() 442 (if (or (= delim ?\()
443 (= delim ?\{) 443 (= delim ?\{)
444 (= delim ?\«)) 444 (= delim ?\«))
445 (replace-match (concat "\"(" 445 (replace-match (concat "\"("
446 (cond ((= delim ?\() "mouse") 446 (cond ((= delim ?\() "mouse")
447 ((= delim ?\{) "face") 447 ((= delim ?\{) "face")
@@ -733,7 +733,7 @@ If PROPS, insert the result."
733(provide 'gnus-spec) 733(provide 'gnus-spec)
734 734
735;; Local Variables: 735;; Local Variables:
736;; coding: iso-8859-1 736;; coding: utf-8
737;; End: 737;; End:
738 738
739;;; gnus-spec.el ends here 739;;; gnus-spec.el ends here
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 183eabca6dc..93bc35af3bd 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -451,7 +451,7 @@ current article is unread."
451 :group 'gnus-summary-maneuvering 451 :group 'gnus-summary-maneuvering
452 :type 'boolean) 452 :type 'boolean)
453 453
454(defcustom gnus-auto-center-summary 454(defcustom gnus-auto-center-summary
455 (max (or (bound-and-true-p scroll-margin) 0) 2) 455 (max (or (bound-and-true-p scroll-margin) 0) 2)
456 "*If non-nil, always center the current summary buffer. 456 "*If non-nil, always center the current summary buffer.
457In particular, if `vertical' do only vertical recentering. If non-nil 457In particular, if `vertical' do only vertical recentering. If non-nil
@@ -9788,7 +9788,7 @@ installed for this command to work."
9788 (when (message-goto-body) 9788 (when (message-goto-body)
9789 (gnus-narrow-to-body)) 9789 (gnus-narrow-to-body))
9790 (goto-char (point-min)) 9790 (goto-char (point-min))
9791 (while (search-forward "·" (point-max) t) 9791 (while (search-forward "·" (point-max) t)
9792 (replace-match ".")) 9792 (replace-match "."))
9793 (unmorse-region (point-min) (point-max)) 9793 (unmorse-region (point-min) (point-max))
9794 (widen) 9794 (widen)
@@ -12978,7 +12978,7 @@ BOOKMARK is a bookmark name or a bookmark record."
12978(run-hooks 'gnus-sum-load-hook) 12978(run-hooks 'gnus-sum-load-hook)
12979 12979
12980;; Local Variables: 12980;; Local Variables:
12981;; coding: iso-8859-1 12981;; coding: utf-8
12982;; End: 12982;; End:
12983 12983
12984;;; gnus-sum.el ends here 12984;;; gnus-sum.el ends here
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el
index 4e05f1abb40..68e75196c87 100644
--- a/lisp/gnus/html2text.el
+++ b/lisp/gnus/html2text.el
@@ -1,4 +1,4 @@
1;;; html2text.el --- a simple html to plain text converter 1;;; html2text.el --- a simple html to plain text converter -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 2002-2013 Free Software Foundation, Inc. 3;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
4 4
@@ -65,14 +65,14 @@
65 ("&ndash;" . "-") 65 ("&ndash;" . "-")
66 ("&permil;" . "%%") 66 ("&permil;" . "%%")
67 ("&plusmn;" . "+-") 67 ("&plusmn;" . "+-")
68 ("&pound;" . "£") 68 ("&pound;" . "£")
69 ("&quot;" . "\"") 69 ("&quot;" . "\"")
70 ("&raquo;" . ">>") 70 ("&raquo;" . ">>")
71 ("&rdquo" . "\"") 71 ("&rdquo" . "\"")
72 ("&reg;" . "(R)") 72 ("&reg;" . "(R)")
73 ("&rsaquo;" . ")") 73 ("&rsaquo;" . ")")
74 ("&rsquo;" . "'") 74 ("&rsquo;" . "'")
75 ("&sect;" . "§") 75 ("&sect;" . "§")
76 ("&sup1;" . "^1") 76 ("&sup1;" . "^1")
77 ("&sup2;" . "^2") 77 ("&sup2;" . "^2")
78 ("&sup3;" . "^3") 78 ("&sup3;" . "^3")
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 808e1edd6c3..a6638097b47 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1743,7 +1743,7 @@ no, only reply back to the author."
1743 (file-error)) 1743 (file-error))
1744 (mm-coding-system-p 'utf-8) 1744 (mm-coding-system-p 'utf-8)
1745 (executable-find idna-program) 1745 (executable-find idna-program)
1746 (string= (idna-to-ascii "räksmörgås") 1746 (string= (idna-to-ascii "räksmörgÃ¥s")
1747 "xn--rksmrgs-5wao1o") 1747 "xn--rksmrgs-5wao1o")
1748 t) 1748 t)
1749 "Whether to encode non-ASCII in domain names into ASCII according to IDNA. 1749 "Whether to encode non-ASCII in domain names into ASCII according to IDNA.
@@ -8421,7 +8421,7 @@ Used in `message-simplify-recipients'."
8421(run-hooks 'message-load-hook) 8421(run-hooks 'message-load-hook)
8422 8422
8423;; Local Variables: 8423;; Local Variables:
8424;; coding: iso-8859-1 8424;; coding: utf-8
8425;; End: 8425;; End:
8426 8426
8427;;; message.el ends here 8427;;; message.el ends here
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 812ee7396dd..04f325633ba 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1803,7 +1803,7 @@ If RECURSIVE, search recursively."
1803 (replace-match (char-to-string char)))) 1803 (replace-match (char-to-string char))))
1804 ;; Remove "soft hyphens". 1804 ;; Remove "soft hyphens".
1805 (goto-char (point-min)) 1805 (goto-char (point-min))
1806 (while (search-forward "­" nil t) 1806 (while (search-forward "­" nil t)
1807 (replace-match "" t t)) 1807 (replace-match "" t t))
1808 (libxml-parse-html-region (point-min) (point-max)))) 1808 (libxml-parse-html-region (point-min) (point-max))))
1809 (unless (bobp) 1809 (unless (bobp)
@@ -1825,7 +1825,7 @@ If RECURSIVE, search recursively."
1825(provide 'mm-decode) 1825(provide 'mm-decode)
1826 1826
1827;; Local Variables: 1827;; Local Variables:
1828;; coding: iso-8859-1 1828;; coding: utf-8
1829;; End: 1829;; End:
1830 1830
1831;;; mm-decode.el ends here 1831;;; mm-decode.el ends here
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 88dee4ad883..5af7639019a 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -2,7 +2,7 @@
2 2
3;; Copyright (C) 1998-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
4 4
5;; Author: Sascha Lüdecke <sascha@meta-x.de>, 5;; Author: Sascha Lüdecke <sascha@meta-x.de>,
6;; Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue) 6;; Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
7;; Keywords: PGP 7;; Keywords: PGP
8 8
@@ -480,7 +480,7 @@ If no one is selected, default secret key is used. "
480(provide 'mml1991) 480(provide 'mml1991)
481 481
482;; Local Variables: 482;; Local Variables:
483;; coding: iso-8859-1 483;; coding: utf-8
484;; End: 484;; End:
485 485
486;;; mml1991.el ends here 486;;; mml1991.el ends here
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 0e2e76f25be..cf5a813c5a8 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1,8 +1,8 @@
1;;; nnir.el --- search mail with various search engines -*- coding: iso-8859-1 -*- 1;;; nnir.el --- search mail with various search engines -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1998-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
4 4
5;; Author: Kai Großjohann <grossjohann@ls6.cs.uni-dortmund.de> 5;; Author: Kai Großjohann <grossjohann@ls6.cs.uni-dortmund.de>
6;; Swish-e and Swish++ backends by: 6;; Swish-e and Swish++ backends by:
7;; Christoph Conrad <christoph.conrad@gmx.de>. 7;; Christoph Conrad <christoph.conrad@gmx.de>.
8;; IMAP backend by: Simon Josefsson <jas@pdc.kth.se>. 8;; IMAP backend by: Simon Josefsson <jas@pdc.kth.se>.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 9bf14ee147a..5df5297ba8a 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -347,11 +347,11 @@ size, and full-buffer size."
347 ((eq shr-folding-mode 'none) 347 ((eq shr-folding-mode 'none)
348 (insert text)) 348 (insert text))
349 (t 349 (t
350 (when (and (string-match "\\`[ \t\n ]" text) 350 (when (and (string-match "\\`[ \t\n ]" text)
351 (not (bolp)) 351 (not (bolp))
352 (not (eq (char-after (1- (point))) ? ))) 352 (not (eq (char-after (1- (point))) ? )))
353 (insert " ")) 353 (insert " "))
354 (dolist (elem (split-string text "[ \f\t\n\r\v ]+" t)) 354 (dolist (elem (split-string text "[ \f\t\n\r\v ]+" t))
355 (when (and (bolp) 355 (when (and (bolp)
356 (> shr-indentation 0)) 356 (> shr-indentation 0))
357 (shr-indent)) 357 (shr-indent))
@@ -391,7 +391,7 @@ size, and full-buffer size."
391 (shr-indent)) 391 (shr-indent))
392 (end-of-line)) 392 (end-of-line))
393 (insert " "))) 393 (insert " ")))
394 (unless (string-match "[ \t\r\n ]\\'" text) 394 (unless (string-match "[ \t\r\n ]\\'" text)
395 (delete-char -1))))) 395 (delete-char -1)))))
396 396
397(defun shr-find-fill-point () 397(defun shr-find-fill-point ()
@@ -1476,7 +1476,7 @@ ones, in case fg and bg are nil."
1476(provide 'shr) 1476(provide 'shr)
1477 1477
1478;; Local Variables: 1478;; Local Variables:
1479;; coding: iso-8859-1 1479;; coding: utf-8
1480;; End: 1480;; End:
1481 1481
1482;;; shr.el ends here 1482;;; shr.el ends here
diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el
index 69b189b6b53..b55b77a383b 100644
--- a/lisp/gnus/utf7.el
+++ b/lisp/gnus/utf7.el
@@ -1,4 +1,4 @@
1;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding: iso-8859-1;-*- 1;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding: utf-8;-*-
2 2
3;; Copyright (C) 1999-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
4 4
@@ -52,10 +52,10 @@
52;; necessary coding system. The code below doesn't seem to DTRT 52;; necessary coding system. The code below doesn't seem to DTRT
53;; generally. E.g.: 53;; generally. E.g.:
54;; 54;;
55;; (utf7-encode "a+£") 55;; (utf7-encode "a+£")
56;; => "a+ACsAow-" 56;; => "a+ACsAow-"
57;; 57;;
58;; $ echo "a+£"|iconv -f iso-8859-1 -t utf-7 58;; $ echo "a+£"|iconv -f utf-8 -t utf-7
59;; a+-+AKM 59;; a+-+AKM
60;; 60;;
61;; -- fx 61;; -- fx
diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index 34488db5f17..407ff3ae7a4 100644
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -1,4 +1,4 @@
1;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: iso-latin-1 -*- 1;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: utf-8 -*-
2;; This file was formerly called gm-lingo.el. 2;; This file was formerly called gm-lingo.el.
3 3
4;; Copyright (C) 1993-1998, 2000-2013 Free Software Foundation, Inc. 4;; Copyright (C) 1993-1998, 2000-2013 Free Software Foundation, Inc.
@@ -45,19 +45,19 @@
45 45
46(defvar iso-spanish-trans-tab 46(defvar iso-spanish-trans-tab
47 '( 47 '(
48 ("~n" "ñ") 48 ("~n" "ñ")
49 ("\([a-zA-Z]\)#" "\\1ñ") 49 ("\([a-zA-Z]\)#" "\\1ñ")
50 ("~N" "Ñ") 50 ("~N" "Ñ")
51 ("\\([-a-zA-Z\"`]\\)\"u" "\\1ü") 51 ("\\([-a-zA-Z\"`]\\)\"u" "\\1ü")
52 ("\\([-a-zA-Z\"`]\\)\"U" "\\1Ü") 52 ("\\([-a-zA-Z\"`]\\)\"U" "\\1Ü")
53 ("\\([-a-zA-Z]\\)'o" "\\1ó") 53 ("\\([-a-zA-Z]\\)'o" "\\1ó")
54 ("\\([-a-zA-Z]\\)'O" "\\Ó") 54 ("\\([-a-zA-Z]\\)'O" "\\Ó")
55 ("\\([-a-zA-Z]\\)'e" "\\1é") 55 ("\\([-a-zA-Z]\\)'e" "\\1é")
56 ("\\([-a-zA-Z]\\)'E" "\\1É") 56 ("\\([-a-zA-Z]\\)'E" "\\1É")
57 ("\\([-a-zA-Z]\\)'a" "\\1á") 57 ("\\([-a-zA-Z]\\)'a" "\\1á")
58 ("\\([-a-zA-Z]\\)'A" "\\1A") 58 ("\\([-a-zA-Z]\\)'A" "\\1A")
59 ("\\([-a-zA-Z]\\)'i" "\\1í") 59 ("\\([-a-zA-Z]\\)'i" "\\1í")
60 ("\\([-a-zA-Z]\\)'I" "\\1Í") 60 ("\\([-a-zA-Z]\\)'I" "\\1Ã")
61 ) 61 )
62 "Spanish translation table.") 62 "Spanish translation table.")
63 63
@@ -89,14 +89,14 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
89 89
90(defvar iso-aggressive-german-trans-tab 90(defvar iso-aggressive-german-trans-tab
91 '( 91 '(
92 ("\"a" "ä") 92 ("\"a" "ä")
93 ("\"A" "Ä") 93 ("\"A" "Ä")
94 ("\"o" "ö") 94 ("\"o" "ö")
95 ("\"O" "Ö") 95 ("\"O" "Ö")
96 ("\"u" "ü") 96 ("\"u" "ü")
97 ("\"U" "Ü") 97 ("\"U" "Ü")
98 ("\"s" "ß") 98 ("\"s" "ß")
99 ("\\\\3" "ß") 99 ("\\\\3" "ß")
100 ) 100 )
101 "German translation table. 101 "German translation table.
102This table uses an aggressive translation approach 102This table uses an aggressive translation approach
@@ -104,14 +104,14 @@ and may erroneously translate too much.")
104 104
105(defvar iso-conservative-german-trans-tab 105(defvar iso-conservative-german-trans-tab
106 '( 106 '(
107 ("\\([-a-zA-Z\"`]\\)\"a" "\\1ä") 107 ("\\([-a-zA-Z\"`]\\)\"a" "\\1ä")
108 ("\\([-a-zA-Z\"`]\\)\"A" "\\1Ä") 108 ("\\([-a-zA-Z\"`]\\)\"A" "\\1Ä")
109 ("\\([-a-zA-Z\"`]\\)\"o" "\\1ö") 109 ("\\([-a-zA-Z\"`]\\)\"o" "\\1ö")
110 ("\\([-a-zA-Z\"`]\\)\"O" "\\1Ö") 110 ("\\([-a-zA-Z\"`]\\)\"O" "\\1Ö")
111 ("\\([-a-zA-Z\"`]\\)\"u" "\\1ü") 111 ("\\([-a-zA-Z\"`]\\)\"u" "\\1ü")
112 ("\\([-a-zA-Z\"`]\\)\"U" "\\1Ü") 112 ("\\([-a-zA-Z\"`]\\)\"U" "\\1Ü")
113 ("\\([-a-zA-Z\"`]\\)\"s" "\\1ß") 113 ("\\([-a-zA-Z\"`]\\)\"s" "\\1ß")
114 ("\\([-a-zA-Z\"`]\\)\\\\3" "\\1ß") 114 ("\\([-a-zA-Z\"`]\\)\\\\3" "\\1ß")
115 ) 115 )
116 "German translation table. 116 "German translation table.
117This table uses a conservative translation approach 117This table uses a conservative translation approach
@@ -131,65 +131,65 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
131 131
132(defvar iso-iso2tex-trans-tab 132(defvar iso-iso2tex-trans-tab
133 '( 133 '(
134 ("ä" "{\\\\\"a}") 134 ("ä" "{\\\\\"a}")
135 ("à" "{\\\\`a}") 135 ("à" "{\\\\`a}")
136 ("á" "{\\\\'a}") 136 ("á" "{\\\\'a}")
137 ("ã" "{\\\\~a}") 137 ("ã" "{\\\\~a}")
138 ("â" "{\\\\^a}") 138 ("â" "{\\\\^a}")
139 ("ë" "{\\\\\"e}") 139 ("ë" "{\\\\\"e}")
140 ("è" "{\\\\`e}") 140 ("è" "{\\\\`e}")
141 ("é" "{\\\\'e}") 141 ("é" "{\\\\'e}")
142 ("ê" "{\\\\^e}") 142 ("ê" "{\\\\^e}")
143 ("ï" "{\\\\\"\\\\i}") 143 ("ï" "{\\\\\"\\\\i}")
144 ("ì" "{\\\\`\\\\i}") 144 ("ì" "{\\\\`\\\\i}")
145 ("í" "{\\\\'\\\\i}") 145 ("í" "{\\\\'\\\\i}")
146 ("î" "{\\\\^\\\\i}") 146 ("î" "{\\\\^\\\\i}")
147 ("ö" "{\\\\\"o}") 147 ("ö" "{\\\\\"o}")
148 ("ò" "{\\\\`o}") 148 ("ò" "{\\\\`o}")
149 ("ó" "{\\\\'o}") 149 ("ó" "{\\\\'o}")
150 ("õ" "{\\\\~o}") 150 ("õ" "{\\\\~o}")
151 ("ô" "{\\\\^o}") 151 ("ô" "{\\\\^o}")
152 ("ü" "{\\\\\"u}") 152 ("ü" "{\\\\\"u}")
153 ("ù" "{\\\\`u}") 153 ("ù" "{\\\\`u}")
154 ("ú" "{\\\\'u}") 154 ("ú" "{\\\\'u}")
155 ("û" "{\\\\^u}") 155 ("û" "{\\\\^u}")
156 ("Ä" "{\\\\\"A}") 156 ("Ä" "{\\\\\"A}")
157 ("À" "{\\\\`A}") 157 ("À" "{\\\\`A}")
158 ("Á" "{\\\\'A}") 158 ("Ã" "{\\\\'A}")
159 ("Ã" "{\\\\~A}") 159 ("Ã" "{\\\\~A}")
160 ("Â" "{\\\\^A}") 160 ("Â" "{\\\\^A}")
161 ("Ë" "{\\\\\"E}") 161 ("Ë" "{\\\\\"E}")
162 ("È" "{\\\\`E}") 162 ("È" "{\\\\`E}")
163 ("É" "{\\\\'E}") 163 ("É" "{\\\\'E}")
164 ("Ê" "{\\\\^E}") 164 ("Ê" "{\\\\^E}")
165 ("Ï" "{\\\\\"I}") 165 ("Ã" "{\\\\\"I}")
166 ("Ì" "{\\\\`I}") 166 ("ÃŒ" "{\\\\`I}")
167 ("Í" "{\\\\'I}") 167 ("Ã" "{\\\\'I}")
168 ("Î" "{\\\\^I}") 168 ("ÃŽ" "{\\\\^I}")
169 ("Ö" "{\\\\\"O}") 169 ("Ö" "{\\\\\"O}")
170 ("Ò" "{\\\\`O}") 170 ("Ã’" "{\\\\`O}")
171 ("Ó" "{\\\\'O}") 171 ("Ó" "{\\\\'O}")
172 ("Õ" "{\\\\~O}") 172 ("Õ" "{\\\\~O}")
173 ("Ô" "{\\\\^O}") 173 ("Ô" "{\\\\^O}")
174 ("Ü" "{\\\\\"U}") 174 ("Ü" "{\\\\\"U}")
175 ("Ù" "{\\\\`U}") 175 ("Ù" "{\\\\`U}")
176 ("Ú" "{\\\\'U}") 176 ("Ú" "{\\\\'U}")
177 ("Û" "{\\\\^U}") 177 ("Û" "{\\\\^U}")
178 ("ñ" "{\\\\~n}") 178 ("ñ" "{\\\\~n}")
179 ("Ñ" "{\\\\~N}") 179 ("Ñ" "{\\\\~N}")
180 ("ç" "{\\\\c c}") 180 ("ç" "{\\\\c c}")
181 ("Ç" "{\\\\c C}") 181 ("Ç" "{\\\\c C}")
182 ("ß" "{\\\\ss}") 182 ("ß" "{\\\\ss}")
183 ("\306" "{\\\\AE}") 183 ("\306" "{\\\\AE}")
184 ("\346" "{\\\\ae}") 184 ("\346" "{\\\\ae}")
185 ("\305" "{\\\\AA}") 185 ("\305" "{\\\\AA}")
186 ("\345" "{\\\\aa}") 186 ("\345" "{\\\\aa}")
187 ("\251" "{\\\\copyright}") 187 ("\251" "{\\\\copyright}")
188 ("£" "{\\\\pounds}") 188 ("£" "{\\\\pounds}")
189 ("¶" "{\\\\P}") 189 ("¶" "{\\\\P}")
190 ("§" "{\\\\S}") 190 ("§" "{\\\\S}")
191 ("¿" "{?`}") 191 ("¿" "{?`}")
192 ("¡" "{!`}") 192 ("¡" "{!`}")
193 ) 193 )
194 "Translation table for translating ISO 8859-1 characters to TeX sequences.") 194 "Translation table for translating ISO 8859-1 characters to TeX sequences.")
195 195
@@ -204,183 +204,183 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
204 204
205(defvar iso-tex2iso-trans-tab 205(defvar iso-tex2iso-trans-tab
206 '( 206 '(
207 ("{\\\\\"a}" "ä") 207 ("{\\\\\"a}" "ä")
208 ("{\\\\`a}" "à") 208 ("{\\\\`a}" "à")
209 ("{\\\\'a}" "á") 209 ("{\\\\'a}" "á")
210 ("{\\\\~a}" "ã") 210 ("{\\\\~a}" "ã")
211 ("{\\\\^a}" "â") 211 ("{\\\\^a}" "â")
212 ("{\\\\\"e}" "ë") 212 ("{\\\\\"e}" "ë")
213 ("{\\\\`e}" "è") 213 ("{\\\\`e}" "è")
214 ("{\\\\'e}" "é") 214 ("{\\\\'e}" "é")
215 ("{\\\\^e}" "ê") 215 ("{\\\\^e}" "ê")
216 ("{\\\\\"\\\\i}" "ï") 216 ("{\\\\\"\\\\i}" "ï")
217 ("{\\\\`\\\\i}" "ì") 217 ("{\\\\`\\\\i}" "ì")
218 ("{\\\\'\\\\i}" "í") 218 ("{\\\\'\\\\i}" "í")
219 ("{\\\\^\\\\i}" "î") 219 ("{\\\\^\\\\i}" "î")
220 ("{\\\\\"i}" "ï") 220 ("{\\\\\"i}" "ï")
221 ("{\\\\`i}" "ì") 221 ("{\\\\`i}" "ì")
222 ("{\\\\'i}" "í") 222 ("{\\\\'i}" "í")
223 ("{\\\\^i}" "î") 223 ("{\\\\^i}" "î")
224 ("{\\\\\"o}" "ö") 224 ("{\\\\\"o}" "ö")
225 ("{\\\\`o}" "ò") 225 ("{\\\\`o}" "ò")
226 ("{\\\\'o}" "ó") 226 ("{\\\\'o}" "ó")
227 ("{\\\\~o}" "õ") 227 ("{\\\\~o}" "õ")
228 ("{\\\\^o}" "ô") 228 ("{\\\\^o}" "ô")
229 ("{\\\\\"u}" "ü") 229 ("{\\\\\"u}" "ü")
230 ("{\\\\`u}" "ù") 230 ("{\\\\`u}" "ù")
231 ("{\\\\'u}" "ú") 231 ("{\\\\'u}" "ú")
232 ("{\\\\^u}" "û") 232 ("{\\\\^u}" "û")
233 ("{\\\\\"A}" "Ä") 233 ("{\\\\\"A}" "Ä")
234 ("{\\\\`A}" "À") 234 ("{\\\\`A}" "À")
235 ("{\\\\'A}" "Á") 235 ("{\\\\'A}" "Ã")
236 ("{\\\\~A}" "Ã") 236 ("{\\\\~A}" "Ã")
237 ("{\\\\^A}" "Â") 237 ("{\\\\^A}" "Â")
238 ("{\\\\\"E}" "Ë") 238 ("{\\\\\"E}" "Ë")
239 ("{\\\\`E}" "È") 239 ("{\\\\`E}" "È")
240 ("{\\\\'E}" "É") 240 ("{\\\\'E}" "É")
241 ("{\\\\^E}" "Ê") 241 ("{\\\\^E}" "Ê")
242 ("{\\\\\"I}" "Ï") 242 ("{\\\\\"I}" "Ã")
243 ("{\\\\`I}" "Ì") 243 ("{\\\\`I}" "ÃŒ")
244 ("{\\\\'I}" "Í") 244 ("{\\\\'I}" "Ã")
245 ("{\\\\^I}" "Î") 245 ("{\\\\^I}" "ÃŽ")
246 ("{\\\\\"O}" "Ö") 246 ("{\\\\\"O}" "Ö")
247 ("{\\\\`O}" "Ò") 247 ("{\\\\`O}" "Ã’")
248 ("{\\\\'O}" "Ó") 248 ("{\\\\'O}" "Ó")
249 ("{\\\\~O}" "Õ") 249 ("{\\\\~O}" "Õ")
250 ("{\\\\^O}" "Ô") 250 ("{\\\\^O}" "Ô")
251 ("{\\\\\"U}" "Ü") 251 ("{\\\\\"U}" "Ü")
252 ("{\\\\`U}" "Ù") 252 ("{\\\\`U}" "Ù")
253 ("{\\\\'U}" "Ú") 253 ("{\\\\'U}" "Ú")
254 ("{\\\\^U}" "Û") 254 ("{\\\\^U}" "Û")
255 ("{\\\\~n}" "ñ") 255 ("{\\\\~n}" "ñ")
256 ("{\\\\~N}" "Ñ") 256 ("{\\\\~N}" "Ñ")
257 ("{\\\\c c}" "ç") 257 ("{\\\\c c}" "ç")
258 ("{\\\\c C}" "Ç") 258 ("{\\\\c C}" "Ç")
259 ("\\\\\"a" "ä") 259 ("\\\\\"a" "ä")
260 ("\\\\`a" "à") 260 ("\\\\`a" "à")
261 ("\\\\'a" "á") 261 ("\\\\'a" "á")
262 ("\\\\~a" "ã") 262 ("\\\\~a" "ã")
263 ("\\\\^a" "â") 263 ("\\\\^a" "â")
264 ("\\\\\"e" "ë") 264 ("\\\\\"e" "ë")
265 ("\\\\`e" "è") 265 ("\\\\`e" "è")
266 ("\\\\'e" "é") 266 ("\\\\'e" "é")
267 ("\\\\^e" "ê") 267 ("\\\\^e" "ê")
268 ;; Discard spaces and/or one EOF after macro \i. 268 ;; Discard spaces and/or one EOF after macro \i.
269 ;; Converting it back will use braces. 269 ;; Converting it back will use braces.
270 ("\\\\\"\\\\i *\n\n" "ï\n\n") 270 ("\\\\\"\\\\i *\n\n" "ï\n\n")
271 ("\\\\\"\\\\i *\n?" "ï") 271 ("\\\\\"\\\\i *\n?" "ï")
272 ("\\\\`\\\\i *\n\n" "ì\n\n") 272 ("\\\\`\\\\i *\n\n" "ì\n\n")
273 ("\\\\`\\\\i *\n?" "ì") 273 ("\\\\`\\\\i *\n?" "ì")
274 ("\\\\'\\\\i *\n\n" "í\n\n") 274 ("\\\\'\\\\i *\n\n" "í\n\n")
275 ("\\\\'\\\\i *\n?" "í") 275 ("\\\\'\\\\i *\n?" "í")
276 ("\\\\^\\\\i *\n\n" "î\n\n") 276 ("\\\\^\\\\i *\n\n" "î\n\n")
277 ("\\\\^\\\\i *\n?" "î") 277 ("\\\\^\\\\i *\n?" "î")
278 ("\\\\\"i" "ï") 278 ("\\\\\"i" "ï")
279 ("\\\\`i" "ì") 279 ("\\\\`i" "ì")
280 ("\\\\'i" "í") 280 ("\\\\'i" "í")
281 ("\\\\^i" "î") 281 ("\\\\^i" "î")
282 ("\\\\\"o" "ö") 282 ("\\\\\"o" "ö")
283 ("\\\\`o" "ò") 283 ("\\\\`o" "ò")
284 ("\\\\'o" "ó") 284 ("\\\\'o" "ó")
285 ("\\\\~o" "õ") 285 ("\\\\~o" "õ")
286 ("\\\\^o" "ô") 286 ("\\\\^o" "ô")
287 ("\\\\\"u" "ü") 287 ("\\\\\"u" "ü")
288 ("\\\\`u" "ù") 288 ("\\\\`u" "ù")
289 ("\\\\'u" "ú") 289 ("\\\\'u" "ú")
290 ("\\\\^u" "û") 290 ("\\\\^u" "û")
291 ("\\\\\"A" "Ä") 291 ("\\\\\"A" "Ä")
292 ("\\\\`A" "À") 292 ("\\\\`A" "À")
293 ("\\\\'A" "Á") 293 ("\\\\'A" "Ã")
294 ("\\\\~A" "Ã") 294 ("\\\\~A" "Ã")
295 ("\\\\^A" "Â") 295 ("\\\\^A" "Â")
296 ("\\\\\"E" "Ë") 296 ("\\\\\"E" "Ë")
297 ("\\\\`E" "È") 297 ("\\\\`E" "È")
298 ("\\\\'E" "É") 298 ("\\\\'E" "É")
299 ("\\\\^E" "Ê") 299 ("\\\\^E" "Ê")
300 ("\\\\\"I" "Ï") 300 ("\\\\\"I" "Ã")
301 ("\\\\`I" "Ì") 301 ("\\\\`I" "ÃŒ")
302 ("\\\\'I" "Í") 302 ("\\\\'I" "Ã")
303 ("\\\\^I" "Î") 303 ("\\\\^I" "ÃŽ")
304 ("\\\\\"O" "Ö") 304 ("\\\\\"O" "Ö")
305 ("\\\\`O" "Ò") 305 ("\\\\`O" "Ã’")
306 ("\\\\'O" "Ó") 306 ("\\\\'O" "Ó")
307 ("\\\\~O" "Õ") 307 ("\\\\~O" "Õ")
308 ("\\\\^O" "Ô") 308 ("\\\\^O" "Ô")
309 ("\\\\\"U" "Ü") 309 ("\\\\\"U" "Ü")
310 ("\\\\`U" "Ù") 310 ("\\\\`U" "Ù")
311 ("\\\\'U" "Ú") 311 ("\\\\'U" "Ú")
312 ("\\\\^U" "Û") 312 ("\\\\^U" "Û")
313 ("\\\\~n" "ñ") 313 ("\\\\~n" "ñ")
314 ("\\\\~N" "Ñ") 314 ("\\\\~N" "Ñ")
315 ("\\\\\"{a}" "ä") 315 ("\\\\\"{a}" "ä")
316 ("\\\\`{a}" "à") 316 ("\\\\`{a}" "à")
317 ("\\\\'{a}" "á") 317 ("\\\\'{a}" "á")
318 ("\\\\~{a}" "ã") 318 ("\\\\~{a}" "ã")
319 ("\\\\^{a}" "â") 319 ("\\\\^{a}" "â")
320 ("\\\\\"{e}" "ë") 320 ("\\\\\"{e}" "ë")
321 ("\\\\`{e}" "è") 321 ("\\\\`{e}" "è")
322 ("\\\\'{e}" "é") 322 ("\\\\'{e}" "é")
323 ("\\\\^{e}" "ê") 323 ("\\\\^{e}" "ê")
324 ("\\\\\"{\\\\i}" "ï") 324 ("\\\\\"{\\\\i}" "ï")
325 ("\\\\`{\\\\i}" "ì") 325 ("\\\\`{\\\\i}" "ì")
326 ("\\\\'{\\\\i}" "í") 326 ("\\\\'{\\\\i}" "í")
327 ("\\\\^{\\\\i}" "î") 327 ("\\\\^{\\\\i}" "î")
328 ("\\\\\"{i}" "ï") 328 ("\\\\\"{i}" "ï")
329 ("\\\\`{i}" "ì") 329 ("\\\\`{i}" "ì")
330 ("\\\\'{i}" "í") 330 ("\\\\'{i}" "í")
331 ("\\\\^{i}" "î") 331 ("\\\\^{i}" "î")
332 ("\\\\\"{o}" "ö") 332 ("\\\\\"{o}" "ö")
333 ("\\\\`{o}" "ò") 333 ("\\\\`{o}" "ò")
334 ("\\\\'{o}" "ó") 334 ("\\\\'{o}" "ó")
335 ("\\\\~{o}" "õ") 335 ("\\\\~{o}" "õ")
336 ("\\\\^{o}" "ô") 336 ("\\\\^{o}" "ô")
337 ("\\\\\"{u}" "ü") 337 ("\\\\\"{u}" "ü")
338 ("\\\\`{u}" "ù") 338 ("\\\\`{u}" "ù")
339 ("\\\\'{u}" "ú") 339 ("\\\\'{u}" "ú")
340 ("\\\\^{u}" "û") 340 ("\\\\^{u}" "û")
341 ("\\\\\"{A}" "Ä") 341 ("\\\\\"{A}" "Ä")
342 ("\\\\`{A}" "À") 342 ("\\\\`{A}" "À")
343 ("\\\\'{A}" "Á") 343 ("\\\\'{A}" "Ã")
344 ("\\\\~{A}" "Ã") 344 ("\\\\~{A}" "Ã")
345 ("\\\\^{A}" "Â") 345 ("\\\\^{A}" "Â")
346 ("\\\\\"{E}" "Ë") 346 ("\\\\\"{E}" "Ë")
347 ("\\\\`{E}" "È") 347 ("\\\\`{E}" "È")
348 ("\\\\'{E}" "É") 348 ("\\\\'{E}" "É")
349 ("\\\\^{E}" "Ê") 349 ("\\\\^{E}" "Ê")
350 ("\\\\\"{I}" "Ï") 350 ("\\\\\"{I}" "Ã")
351 ("\\\\`{I}" "Ì") 351 ("\\\\`{I}" "ÃŒ")
352 ("\\\\'{I}" "Í") 352 ("\\\\'{I}" "Ã")
353 ("\\\\^{I}" "Î") 353 ("\\\\^{I}" "ÃŽ")
354 ("\\\\\"{O}" "Ö") 354 ("\\\\\"{O}" "Ö")
355 ("\\\\`{O}" "Ò") 355 ("\\\\`{O}" "Ã’")
356 ("\\\\'{O}" "Ó") 356 ("\\\\'{O}" "Ó")
357 ("\\\\~{O}" "Õ") 357 ("\\\\~{O}" "Õ")
358 ("\\\\^{O}" "Ô") 358 ("\\\\^{O}" "Ô")
359 ("\\\\\"{U}" "Ü") 359 ("\\\\\"{U}" "Ü")
360 ("\\\\`{U}" "Ù") 360 ("\\\\`{U}" "Ù")
361 ("\\\\'{U}" "Ú") 361 ("\\\\'{U}" "Ú")
362 ("\\\\^{U}" "Û") 362 ("\\\\^{U}" "Û")
363 ("\\\\~{n}" "ñ") 363 ("\\\\~{n}" "ñ")
364 ("\\\\~{N}" "Ñ") 364 ("\\\\~{N}" "Ñ")
365 ("\\\\c{c}" "ç") 365 ("\\\\c{c}" "ç")
366 ("\\\\c{C}" "Ç") 366 ("\\\\c{C}" "Ç")
367 ("{\\\\ss}" "ß") 367 ("{\\\\ss}" "ß")
368 ("{\\\\AE}" "\306") 368 ("{\\\\AE}" "\306")
369 ("{\\\\ae}" "\346") 369 ("{\\\\ae}" "\346")
370 ("{\\\\AA}" "\305") 370 ("{\\\\AA}" "\305")
371 ("{\\\\aa}" "\345") 371 ("{\\\\aa}" "\345")
372 ("{\\\\copyright}" "\251") 372 ("{\\\\copyright}" "\251")
373 ("\\\\copyright{}" "\251") 373 ("\\\\copyright{}" "\251")
374 ("{\\\\pounds}" "£" ) 374 ("{\\\\pounds}" "£" )
375 ("{\\\\P}" "¶" ) 375 ("{\\\\P}" "¶" )
376 ("{\\\\S}" "§" ) 376 ("{\\\\S}" "§" )
377 ("\\\\pounds{}" "£" ) 377 ("\\\\pounds{}" "£" )
378 ("\\\\P{}" "¶" ) 378 ("\\\\P{}" "¶" )
379 ("\\\\S{}" "§" ) 379 ("\\\\S{}" "§" )
380 ("{\\?`}" "¿") 380 ("{\\?`}" "¿")
381 ("{!`}" "¡") 381 ("{!`}" "¡")
382 ("\\?`" "¿") 382 ("\\?`" "¿")
383 ("!`" "¡") 383 ("!`" "¡")
384 ) 384 )
385 "Translation table for translating TeX sequences to ISO 8859-1 characters. 385 "Translation table for translating TeX sequences to ISO 8859-1 characters.
386This table is not exhaustive (and due to TeX's power can never be). 386This table is not exhaustive (and due to TeX's power can never be).
@@ -397,185 +397,185 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
397 397
398(defvar iso-gtex2iso-trans-tab 398(defvar iso-gtex2iso-trans-tab
399 '( 399 '(
400 ("{\\\\\"a}" "ä") 400 ("{\\\\\"a}" "ä")
401 ("{\\\\`a}" "à") 401 ("{\\\\`a}" "à")
402 ("{\\\\'a}" "á") 402 ("{\\\\'a}" "á")
403 ("{\\\\~a}" "ã") 403 ("{\\\\~a}" "ã")
404 ("{\\\\^a}" "â") 404 ("{\\\\^a}" "â")
405 ("{\\\\\"e}" "ë") 405 ("{\\\\\"e}" "ë")
406 ("{\\\\`e}" "è") 406 ("{\\\\`e}" "è")
407 ("{\\\\'e}" "é") 407 ("{\\\\'e}" "é")
408 ("{\\\\^e}" "ê") 408 ("{\\\\^e}" "ê")
409 ("{\\\\\"\\\\i}" "ï") 409 ("{\\\\\"\\\\i}" "ï")
410 ("{\\\\`\\\\i}" "ì") 410 ("{\\\\`\\\\i}" "ì")
411 ("{\\\\'\\\\i}" "í") 411 ("{\\\\'\\\\i}" "í")
412 ("{\\\\^\\\\i}" "î") 412 ("{\\\\^\\\\i}" "î")
413 ("{\\\\\"i}" "ï") 413 ("{\\\\\"i}" "ï")
414 ("{\\\\`i}" "ì") 414 ("{\\\\`i}" "ì")
415 ("{\\\\'i}" "í") 415 ("{\\\\'i}" "í")
416 ("{\\\\^i}" "î") 416 ("{\\\\^i}" "î")
417 ("{\\\\\"o}" "ö") 417 ("{\\\\\"o}" "ö")
418 ("{\\\\`o}" "ò") 418 ("{\\\\`o}" "ò")
419 ("{\\\\'o}" "ó") 419 ("{\\\\'o}" "ó")
420 ("{\\\\~o}" "õ") 420 ("{\\\\~o}" "õ")
421 ("{\\\\^o}" "ô") 421 ("{\\\\^o}" "ô")
422 ("{\\\\\"u}" "ü") 422 ("{\\\\\"u}" "ü")
423 ("{\\\\`u}" "ù") 423 ("{\\\\`u}" "ù")
424 ("{\\\\'u}" "ú") 424 ("{\\\\'u}" "ú")
425 ("{\\\\^u}" "û") 425 ("{\\\\^u}" "û")
426 ("{\\\\\"A}" "Ä") 426 ("{\\\\\"A}" "Ä")
427 ("{\\\\`A}" "À") 427 ("{\\\\`A}" "À")
428 ("{\\\\'A}" "Á") 428 ("{\\\\'A}" "Ã")
429 ("{\\\\~A}" "Ã") 429 ("{\\\\~A}" "Ã")
430 ("{\\\\^A}" "Â") 430 ("{\\\\^A}" "Â")
431 ("{\\\\\"E}" "Ë") 431 ("{\\\\\"E}" "Ë")
432 ("{\\\\`E}" "È") 432 ("{\\\\`E}" "È")
433 ("{\\\\'E}" "É") 433 ("{\\\\'E}" "É")
434 ("{\\\\^E}" "Ê") 434 ("{\\\\^E}" "Ê")
435 ("{\\\\\"I}" "Ï") 435 ("{\\\\\"I}" "Ã")
436 ("{\\\\`I}" "Ì") 436 ("{\\\\`I}" "ÃŒ")
437 ("{\\\\'I}" "Í") 437 ("{\\\\'I}" "Ã")
438 ("{\\\\^I}" "Î") 438 ("{\\\\^I}" "ÃŽ")
439 ("{\\\\\"O}" "Ö") 439 ("{\\\\\"O}" "Ö")
440 ("{\\\\`O}" "Ò") 440 ("{\\\\`O}" "Ã’")
441 ("{\\\\'O}" "Ó") 441 ("{\\\\'O}" "Ó")
442 ("{\\\\~O}" "Õ") 442 ("{\\\\~O}" "Õ")
443 ("{\\\\^O}" "Ô") 443 ("{\\\\^O}" "Ô")
444 ("{\\\\\"U}" "Ü") 444 ("{\\\\\"U}" "Ü")
445 ("{\\\\`U}" "Ù") 445 ("{\\\\`U}" "Ù")
446 ("{\\\\'U}" "Ú") 446 ("{\\\\'U}" "Ú")
447 ("{\\\\^U}" "Û") 447 ("{\\\\^U}" "Û")
448 ("{\\\\~n}" "ñ") 448 ("{\\\\~n}" "ñ")
449 ("{\\\\~N}" "Ñ") 449 ("{\\\\~N}" "Ñ")
450 ("{\\\\c c}" "ç") 450 ("{\\\\c c}" "ç")
451 ("{\\\\c C}" "Ç") 451 ("{\\\\c C}" "Ç")
452 ("\\\\\"a" "ä") 452 ("\\\\\"a" "ä")
453 ("\\\\`a" "à") 453 ("\\\\`a" "à")
454 ("\\\\'a" "á") 454 ("\\\\'a" "á")
455 ("\\\\~a" "ã") 455 ("\\\\~a" "ã")
456 ("\\\\^a" "â") 456 ("\\\\^a" "â")
457 ("\\\\\"e" "ë") 457 ("\\\\\"e" "ë")
458 ("\\\\`e" "è") 458 ("\\\\`e" "è")
459 ("\\\\'e" "é") 459 ("\\\\'e" "é")
460 ("\\\\^e" "ê") 460 ("\\\\^e" "ê")
461 ("\\\\\"\\\\i" "ï") 461 ("\\\\\"\\\\i" "ï")
462 ("\\\\`\\\\i" "ì") 462 ("\\\\`\\\\i" "ì")
463 ("\\\\'\\\\i" "í") 463 ("\\\\'\\\\i" "í")
464 ("\\\\^\\\\i" "î") 464 ("\\\\^\\\\i" "î")
465 ("\\\\\"i" "ï") 465 ("\\\\\"i" "ï")
466 ("\\\\`i" "ì") 466 ("\\\\`i" "ì")
467 ("\\\\'i" "í") 467 ("\\\\'i" "í")
468 ("\\\\^i" "î") 468 ("\\\\^i" "î")
469 ("\\\\\"o" "ö") 469 ("\\\\\"o" "ö")
470 ("\\\\`o" "ò") 470 ("\\\\`o" "ò")
471 ("\\\\'o" "ó") 471 ("\\\\'o" "ó")
472 ("\\\\~o" "õ") 472 ("\\\\~o" "õ")
473 ("\\\\^o" "ô") 473 ("\\\\^o" "ô")
474 ("\\\\\"u" "ü") 474 ("\\\\\"u" "ü")
475 ("\\\\`u" "ù") 475 ("\\\\`u" "ù")
476 ("\\\\'u" "ú") 476 ("\\\\'u" "ú")
477 ("\\\\^u" "û") 477 ("\\\\^u" "û")
478 ("\\\\\"A" "Ä") 478 ("\\\\\"A" "Ä")
479 ("\\\\`A" "À") 479 ("\\\\`A" "À")
480 ("\\\\'A" "Á") 480 ("\\\\'A" "Ã")
481 ("\\\\~A" "Ã") 481 ("\\\\~A" "Ã")
482 ("\\\\^A" "Â") 482 ("\\\\^A" "Â")
483 ("\\\\\"E" "Ë") 483 ("\\\\\"E" "Ë")
484 ("\\\\`E" "È") 484 ("\\\\`E" "È")
485 ("\\\\'E" "É") 485 ("\\\\'E" "É")
486 ("\\\\^E" "Ê") 486 ("\\\\^E" "Ê")
487 ("\\\\\"I" "Ï") 487 ("\\\\\"I" "Ã")
488 ("\\\\`I" "Ì") 488 ("\\\\`I" "ÃŒ")
489 ("\\\\'I" "Í") 489 ("\\\\'I" "Ã")
490 ("\\\\^I" "Î") 490 ("\\\\^I" "ÃŽ")
491 ("\\\\\"O" "Ö") 491 ("\\\\\"O" "Ö")
492 ("\\\\`O" "Ò") 492 ("\\\\`O" "Ã’")
493 ("\\\\'O" "Ó") 493 ("\\\\'O" "Ó")
494 ("\\\\~O" "Õ") 494 ("\\\\~O" "Õ")
495 ("\\\\^O" "Ô") 495 ("\\\\^O" "Ô")
496 ("\\\\\"U" "Ü") 496 ("\\\\\"U" "Ü")
497 ("\\\\`U" "Ù") 497 ("\\\\`U" "Ù")
498 ("\\\\'U" "Ú") 498 ("\\\\'U" "Ú")
499 ("\\\\^U" "Û") 499 ("\\\\^U" "Û")
500 ("\\\\~n" "ñ") 500 ("\\\\~n" "ñ")
501 ("\\\\~N" "Ñ") 501 ("\\\\~N" "Ñ")
502 ("\\\\\"{a}" "ä") 502 ("\\\\\"{a}" "ä")
503 ("\\\\`{a}" "à") 503 ("\\\\`{a}" "à")
504 ("\\\\'{a}" "á") 504 ("\\\\'{a}" "á")
505 ("\\\\~{a}" "ã") 505 ("\\\\~{a}" "ã")
506 ("\\\\^{a}" "â") 506 ("\\\\^{a}" "â")
507 ("\\\\\"{e}" "ë") 507 ("\\\\\"{e}" "ë")
508 ("\\\\`{e}" "è") 508 ("\\\\`{e}" "è")
509 ("\\\\'{e}" "é") 509 ("\\\\'{e}" "é")
510 ("\\\\^{e}" "ê") 510 ("\\\\^{e}" "ê")
511 ("\\\\\"{\\\\i}" "ï") 511 ("\\\\\"{\\\\i}" "ï")
512 ("\\\\`{\\\\i}" "ì") 512 ("\\\\`{\\\\i}" "ì")
513 ("\\\\'{\\\\i}" "í") 513 ("\\\\'{\\\\i}" "í")
514 ("\\\\^{\\\\i}" "î") 514 ("\\\\^{\\\\i}" "î")
515 ("\\\\\"{i}" "ï") 515 ("\\\\\"{i}" "ï")
516 ("\\\\`{i}" "ì") 516 ("\\\\`{i}" "ì")
517 ("\\\\'{i}" "í") 517 ("\\\\'{i}" "í")
518 ("\\\\^{i}" "î") 518 ("\\\\^{i}" "î")
519 ("\\\\\"{o}" "ö") 519 ("\\\\\"{o}" "ö")
520 ("\\\\`{o}" "ò") 520 ("\\\\`{o}" "ò")
521 ("\\\\'{o}" "ó") 521 ("\\\\'{o}" "ó")
522 ("\\\\~{o}" "õ") 522 ("\\\\~{o}" "õ")
523 ("\\\\^{o}" "ô") 523 ("\\\\^{o}" "ô")
524 ("\\\\\"{u}" "ü") 524 ("\\\\\"{u}" "ü")
525 ("\\\\`{u}" "ù") 525 ("\\\\`{u}" "ù")
526 ("\\\\'{u}" "ú") 526 ("\\\\'{u}" "ú")
527 ("\\\\^{u}" "û") 527 ("\\\\^{u}" "û")
528 ("\\\\\"{A}" "Ä") 528 ("\\\\\"{A}" "Ä")
529 ("\\\\`{A}" "À") 529 ("\\\\`{A}" "À")
530 ("\\\\'{A}" "Á") 530 ("\\\\'{A}" "Ã")
531 ("\\\\~{A}" "Ã") 531 ("\\\\~{A}" "Ã")
532 ("\\\\^{A}" "Â") 532 ("\\\\^{A}" "Â")
533 ("\\\\\"{E}" "Ë") 533 ("\\\\\"{E}" "Ë")
534 ("\\\\`{E}" "È") 534 ("\\\\`{E}" "È")
535 ("\\\\'{E}" "É") 535 ("\\\\'{E}" "É")
536 ("\\\\^{E}" "Ê") 536 ("\\\\^{E}" "Ê")
537 ("\\\\\"{I}" "Ï") 537 ("\\\\\"{I}" "Ã")
538 ("\\\\`{I}" "Ì") 538 ("\\\\`{I}" "ÃŒ")
539 ("\\\\'{I}" "Í") 539 ("\\\\'{I}" "Ã")
540 ("\\\\^{I}" "Î") 540 ("\\\\^{I}" "ÃŽ")
541 ("\\\\\"{O}" "Ö") 541 ("\\\\\"{O}" "Ö")
542 ("\\\\`{O}" "Ò") 542 ("\\\\`{O}" "Ã’")
543 ("\\\\'{O}" "Ó") 543 ("\\\\'{O}" "Ó")
544 ("\\\\~{O}" "Õ") 544 ("\\\\~{O}" "Õ")
545 ("\\\\^{O}" "Ô") 545 ("\\\\^{O}" "Ô")
546 ("\\\\\"{U}" "Ü") 546 ("\\\\\"{U}" "Ü")
547 ("\\\\`{U}" "Ù") 547 ("\\\\`{U}" "Ù")
548 ("\\\\'{U}" "Ú") 548 ("\\\\'{U}" "Ú")
549 ("\\\\^{U}" "Û") 549 ("\\\\^{U}" "Û")
550 ("\\\\~{n}" "ñ") 550 ("\\\\~{n}" "ñ")
551 ("\\\\~{N}" "Ñ") 551 ("\\\\~{N}" "Ñ")
552 ("\\\\c{c}" "ç") 552 ("\\\\c{c}" "ç")
553 ("\\\\c{C}" "Ç") 553 ("\\\\c{C}" "Ç")
554 ("{\\\\ss}" "ß") 554 ("{\\\\ss}" "ß")
555 ("{\\\\AE}" "\306") 555 ("{\\\\AE}" "\306")
556 ("{\\\\ae}" "\346") 556 ("{\\\\ae}" "\346")
557 ("{\\\\AA}" "\305") 557 ("{\\\\AA}" "\305")
558 ("{\\\\aa}" "\345") 558 ("{\\\\aa}" "\345")
559 ("{\\\\copyright}" "\251") 559 ("{\\\\copyright}" "\251")
560 ("\\\\copyright{}" "\251") 560 ("\\\\copyright{}" "\251")
561 ("{\\\\pounds}" "£" ) 561 ("{\\\\pounds}" "£" )
562 ("{\\\\P}" "¶" ) 562 ("{\\\\P}" "¶" )
563 ("{\\\\S}" "§" ) 563 ("{\\\\S}" "§" )
564 ("\\\\pounds{}" "£" ) 564 ("\\\\pounds{}" "£" )
565 ("\\\\P{}" "¶" ) 565 ("\\\\P{}" "¶" )
566 ("\\\\S{}" "§" ) 566 ("\\\\S{}" "§" )
567 ("?`" "¿") 567 ("?`" "¿")
568 ("!`" "¡") 568 ("!`" "¡")
569 ("{?`}" "¿") 569 ("{?`}" "¿")
570 ("{!`}" "¡") 570 ("{!`}" "¡")
571 ("\"a" "ä") 571 ("\"a" "ä")
572 ("\"A" "Ä") 572 ("\"A" "Ä")
573 ("\"o" "ö") 573 ("\"o" "ö")
574 ("\"O" "Ö") 574 ("\"O" "Ö")
575 ("\"u" "ü") 575 ("\"u" "ü")
576 ("\"U" "Ü") 576 ("\"U" "Ü")
577 ("\"s" "ß") 577 ("\"s" "ß")
578 ("\\\\3" "ß") 578 ("\\\\3" "ß")
579 ) 579 )
580 "Translation table for translating German TeX sequences to ISO 8859-1. 580 "Translation table for translating German TeX sequences to ISO 8859-1.
581This table is not exhaustive (and due to TeX's power can never be). 581This table is not exhaustive (and due to TeX's power can never be).
@@ -583,65 +583,65 @@ It only contains commonly used sequences.")
583 583
584(defvar iso-iso2gtex-trans-tab 584(defvar iso-iso2gtex-trans-tab
585 '( 585 '(
586 ("ä" "\"a") 586 ("ä" "\"a")
587 ("à" "{\\\\`a}") 587 ("à" "{\\\\`a}")
588 ("á" "{\\\\'a}") 588 ("á" "{\\\\'a}")
589 ("ã" "{\\\\~a}") 589 ("ã" "{\\\\~a}")
590 ("â" "{\\\\^a}") 590 ("â" "{\\\\^a}")
591 ("ë" "{\\\\\"e}") 591 ("ë" "{\\\\\"e}")
592 ("è" "{\\\\`e}") 592 ("è" "{\\\\`e}")
593 ("é" "{\\\\'e}") 593 ("é" "{\\\\'e}")
594 ("ê" "{\\\\^e}") 594 ("ê" "{\\\\^e}")
595 ("ï" "{\\\\\"\\\\i}") 595 ("ï" "{\\\\\"\\\\i}")
596 ("ì" "{\\\\`\\\\i}") 596 ("ì" "{\\\\`\\\\i}")
597 ("í" "{\\\\'\\\\i}") 597 ("í" "{\\\\'\\\\i}")
598 ("î" "{\\\\^\\\\i}") 598 ("î" "{\\\\^\\\\i}")
599 ("ö" "\"o") 599 ("ö" "\"o")
600 ("ò" "{\\\\`o}") 600 ("ò" "{\\\\`o}")
601 ("ó" "{\\\\'o}") 601 ("ó" "{\\\\'o}")
602 ("õ" "{\\\\~o}") 602 ("õ" "{\\\\~o}")
603 ("ô" "{\\\\^o}") 603 ("ô" "{\\\\^o}")
604 ("ü" "\"u") 604 ("ü" "\"u")
605 ("ù" "{\\\\`u}") 605 ("ù" "{\\\\`u}")
606 ("ú" "{\\\\'u}") 606 ("ú" "{\\\\'u}")
607 ("û" "{\\\\^u}") 607 ("û" "{\\\\^u}")
608 ("Ä" "\"A") 608 ("Ä" "\"A")
609 ("À" "{\\\\`A}") 609 ("À" "{\\\\`A}")
610 ("Á" "{\\\\'A}") 610 ("Ã" "{\\\\'A}")
611 ("Ã" "{\\\\~A}") 611 ("Ã" "{\\\\~A}")
612 ("Â" "{\\\\^A}") 612 ("Â" "{\\\\^A}")
613 ("Ë" "{\\\\\"E}") 613 ("Ë" "{\\\\\"E}")
614 ("È" "{\\\\`E}") 614 ("È" "{\\\\`E}")
615 ("É" "{\\\\'E}") 615 ("É" "{\\\\'E}")
616 ("Ê" "{\\\\^E}") 616 ("Ê" "{\\\\^E}")
617 ("Ï" "{\\\\\"I}") 617 ("Ã" "{\\\\\"I}")
618 ("Ì" "{\\\\`I}") 618 ("ÃŒ" "{\\\\`I}")
619 ("Í" "{\\\\'I}") 619 ("Ã" "{\\\\'I}")
620 ("Î" "{\\\\^I}") 620 ("ÃŽ" "{\\\\^I}")
621 ("Ö" "\"O") 621 ("Ö" "\"O")
622 ("Ò" "{\\\\`O}") 622 ("Ã’" "{\\\\`O}")
623 ("Ó" "{\\\\'O}") 623 ("Ó" "{\\\\'O}")
624 ("Õ" "{\\\\~O}") 624 ("Õ" "{\\\\~O}")
625 ("Ô" "{\\\\^O}") 625 ("Ô" "{\\\\^O}")
626 ("Ü" "\"U") 626 ("Ü" "\"U")
627 ("Ù" "{\\\\`U}") 627 ("Ù" "{\\\\`U}")
628 ("Ú" "{\\\\'U}") 628 ("Ú" "{\\\\'U}")
629 ("Û" "{\\\\^U}") 629 ("Û" "{\\\\^U}")
630 ("ñ" "{\\\\~n}") 630 ("ñ" "{\\\\~n}")
631 ("Ñ" "{\\\\~N}") 631 ("Ñ" "{\\\\~N}")
632 ("ç" "{\\\\c c}") 632 ("ç" "{\\\\c c}")
633 ("Ç" "{\\\\c C}") 633 ("Ç" "{\\\\c C}")
634 ("ß" "\"s") 634 ("ß" "\"s")
635 ("\306" "{\\\\AE}") 635 ("\306" "{\\\\AE}")
636 ("\346" "{\\\\ae}") 636 ("\346" "{\\\\ae}")
637 ("\305" "{\\\\AA}") 637 ("\305" "{\\\\AA}")
638 ("\345" "{\\\\aa}") 638 ("\345" "{\\\\aa}")
639 ("\251" "{\\\\copyright}") 639 ("\251" "{\\\\copyright}")
640 ("£" "{\\\\pounds}") 640 ("£" "{\\\\pounds}")
641 ("¶" "{\\\\P}") 641 ("¶" "{\\\\P}")
642 ("§" "{\\\\S}") 642 ("§" "{\\\\S}")
643 ("¿" "{?`}") 643 ("¿" "{?`}")
644 ("¡" "{!`}") 644 ("¡" "{!`}")
645 ) 645 )
646 "Translation table for translating ISO 8859-1 characters to German TeX.") 646 "Translation table for translating ISO 8859-1 characters to German TeX.")
647 647
@@ -664,13 +664,13 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
664 (iso-translate-conventions from to iso-iso2gtex-trans-tab)) 664 (iso-translate-conventions from to iso-iso2gtex-trans-tab))
665 665
666(defvar iso-iso2duden-trans-tab 666(defvar iso-iso2duden-trans-tab
667 '(("ä" "ae") 667 '(("ä" "ae")
668 ("Ä" "Ae") 668 ("Ä" "Ae")
669 ("ö" "oe") 669 ("ö" "oe")
670 ("Ö" "Oe") 670 ("Ö" "Oe")
671 ("ü" "ue") 671 ("ü" "ue")
672 ("Ü" "Ue") 672 ("Ü" "Ue")
673 ("ß" "ss")) 673 ("ß" "ss"))
674 "Translation table for translating ISO 8859-1 characters to Duden sequences.") 674 "Translation table for translating ISO 8859-1 characters to Duden sequences.")
675 675
676;;;###autoload 676;;;###autoload
@@ -683,133 +683,133 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
683 (iso-translate-conventions from to iso-iso2duden-trans-tab)) 683 (iso-translate-conventions from to iso-iso2duden-trans-tab))
684 684
685(defvar iso-iso2sgml-trans-tab 685(defvar iso-iso2sgml-trans-tab
686 '(("À" "&Agrave;") 686 '(("À" "&Agrave;")
687 ("Á" "&Aacute;") 687 ("Ã" "&Aacute;")
688 ("Â" "&Acirc;") 688 ("Â" "&Acirc;")
689 ("Ã" "&Atilde;") 689 ("Ã" "&Atilde;")
690 ("Ä" "&Auml;") 690 ("Ä" "&Auml;")
691 ("Å" "&Aring;") 691 ("Ã…" "&Aring;")
692 ("Æ" "&AElig;") 692 ("Æ" "&AElig;")
693 ("Ç" "&Ccedil;") 693 ("Ç" "&Ccedil;")
694 ("È" "&Egrave;") 694 ("È" "&Egrave;")
695 ("É" "&Eacute;") 695 ("É" "&Eacute;")
696 ("Ê" "&Ecirc;") 696 ("Ê" "&Ecirc;")
697 ("Ë" "&Euml;") 697 ("Ë" "&Euml;")
698 ("Ì" "&Igrave;") 698 ("ÃŒ" "&Igrave;")
699 ("Í" "&Iacute;") 699 ("Ã" "&Iacute;")
700 ("Î" "&Icirc;") 700 ("ÃŽ" "&Icirc;")
701 ("Ï" "&Iuml;") 701 ("Ã" "&Iuml;")
702 ("Ð" "&ETH;") 702 ("Ã" "&ETH;")
703 ("Ñ" "&Ntilde;") 703 ("Ñ" "&Ntilde;")
704 ("Ò" "&Ograve;") 704 ("Ã’" "&Ograve;")
705 ("Ó" "&Oacute;") 705 ("Ó" "&Oacute;")
706 ("Ô" "&Ocirc;") 706 ("Ô" "&Ocirc;")
707 ("Õ" "&Otilde;") 707 ("Õ" "&Otilde;")
708 ("Ö" "&Ouml;") 708 ("Ö" "&Ouml;")
709 ("Ø" "&Oslash;") 709 ("Ø" "&Oslash;")
710 ("Ù" "&Ugrave;") 710 ("Ù" "&Ugrave;")
711 ("Ú" "&Uacute;") 711 ("Ú" "&Uacute;")
712 ("Û" "&Ucirc;") 712 ("Û" "&Ucirc;")
713 ("Ü" "&Uuml;") 713 ("Ü" "&Uuml;")
714 ("Ý" "&Yacute;") 714 ("Ã" "&Yacute;")
715 ("Þ" "&THORN;") 715 ("Þ" "&THORN;")
716 ("ß" "&szlig;") 716 ("ß" "&szlig;")
717 ("à" "&agrave;") 717 ("à" "&agrave;")
718 ("á" "&aacute;") 718 ("á" "&aacute;")
719 ("â" "&acirc;") 719 ("â" "&acirc;")
720 ("ã" "&atilde;") 720 ("ã" "&atilde;")
721 ("ä" "&auml;") 721 ("ä" "&auml;")
722 ("å" "&aring;") 722 ("Ã¥" "&aring;")
723 ("æ" "&aelig;") 723 ("æ" "&aelig;")
724 ("ç" "&ccedil;") 724 ("ç" "&ccedil;")
725 ("è" "&egrave;") 725 ("è" "&egrave;")
726 ("é" "&eacute;") 726 ("é" "&eacute;")
727 ("ê" "&ecirc;") 727 ("ê" "&ecirc;")
728 ("ë" "&euml;") 728 ("ë" "&euml;")
729 ("ì" "&igrave;") 729 ("ì" "&igrave;")
730 ("í" "&iacute;") 730 ("í" "&iacute;")
731 ("î" "&icirc;") 731 ("î" "&icirc;")
732 ("ï" "&iuml;") 732 ("ï" "&iuml;")
733 ("ð" "&eth;") 733 ("ð" "&eth;")
734 ("ñ" "&ntilde;") 734 ("ñ" "&ntilde;")
735 ("ò" "&ograve;") 735 ("ò" "&ograve;")
736 ("ó" "&oacute;") 736 ("ó" "&oacute;")
737 ("ô" "&ocirc;") 737 ("ô" "&ocirc;")
738 ("õ" "&otilde;") 738 ("õ" "&otilde;")
739 ("ö" "&ouml;") 739 ("ö" "&ouml;")
740 ("ø" "&oslash;") 740 ("ø" "&oslash;")
741 ("ù" "&ugrave;") 741 ("ù" "&ugrave;")
742 ("ú" "&uacute;") 742 ("ú" "&uacute;")
743 ("û" "&ucirc;") 743 ("û" "&ucirc;")
744 ("ü" "&uuml;") 744 ("ü" "&uuml;")
745 ("ý" "&yacute;") 745 ("ý" "&yacute;")
746 ("þ" "&thorn;") 746 ("þ" "&thorn;")
747 ("ÿ" "&yuml;"))) 747 ("ÿ" "&yuml;")))
748 748
749(defvar iso-sgml2iso-trans-tab 749(defvar iso-sgml2iso-trans-tab
750 '(("&Agrave;" "À") 750 '(("&Agrave;" "À")
751 ("&Aacute;" "Á") 751 ("&Aacute;" "Ã")
752 ("&Acirc;" "Â") 752 ("&Acirc;" "Â")
753 ("&Atilde;" "Ã") 753 ("&Atilde;" "Ã")
754 ("&Auml;" "Ä") 754 ("&Auml;" "Ä")
755 ("&Aring;" "Å") 755 ("&Aring;" "Ã…")
756 ("&AElig;" "Æ") 756 ("&AElig;" "Æ")
757 ("&Ccedil;" "Ç") 757 ("&Ccedil;" "Ç")
758 ("&Egrave;" "È") 758 ("&Egrave;" "È")
759 ("&Eacute;" "É") 759 ("&Eacute;" "É")
760 ("&Ecirc;" "Ê") 760 ("&Ecirc;" "Ê")
761 ("&Euml;" "Ë") 761 ("&Euml;" "Ë")
762 ("&Igrave;" "Ì") 762 ("&Igrave;" "ÃŒ")
763 ("&Iacute;" "Í") 763 ("&Iacute;" "Ã")
764 ("&Icirc;" "Î") 764 ("&Icirc;" "ÃŽ")
765 ("&Iuml;" "Ï") 765 ("&Iuml;" "Ã")
766 ("&ETH;" "Ð") 766 ("&ETH;" "Ã")
767 ("&Ntilde;" "Ñ") 767 ("&Ntilde;" "Ñ")
768 ("&Ograve;" "Ò") 768 ("&Ograve;" "Ã’")
769 ("&Oacute;" "Ó") 769 ("&Oacute;" "Ó")
770 ("&Ocirc;" "Ô") 770 ("&Ocirc;" "Ô")
771 ("&Otilde;" "Õ") 771 ("&Otilde;" "Õ")
772 ("&Ouml;" "Ö") 772 ("&Ouml;" "Ö")
773 ("&Oslash;" "Ø") 773 ("&Oslash;" "Ø")
774 ("&Ugrave;" "Ù") 774 ("&Ugrave;" "Ù")
775 ("&Uacute;" "Ú") 775 ("&Uacute;" "Ú")
776 ("&Ucirc;" "Û") 776 ("&Ucirc;" "Û")
777 ("&Uuml;" "Ü") 777 ("&Uuml;" "Ü")
778 ("&Yacute;" "Ý") 778 ("&Yacute;" "Ã")
779 ("&THORN;" "Þ") 779 ("&THORN;" "Þ")
780 ("&szlig;" "ß") 780 ("&szlig;" "ß")
781 ("&agrave;" "à") 781 ("&agrave;" "à")
782 ("&aacute;" "á") 782 ("&aacute;" "á")
783 ("&acirc;" "â") 783 ("&acirc;" "â")
784 ("&atilde;" "ã") 784 ("&atilde;" "ã")
785 ("&auml;" "ä") 785 ("&auml;" "ä")
786 ("&aring;" "å") 786 ("&aring;" "Ã¥")
787 ("&aelig;" "æ") 787 ("&aelig;" "æ")
788 ("&ccedil;" "ç") 788 ("&ccedil;" "ç")
789 ("&egrave;" "è") 789 ("&egrave;" "è")
790 ("&eacute;" "é") 790 ("&eacute;" "é")
791 ("&ecirc;" "ê") 791 ("&ecirc;" "ê")
792 ("&euml;" "ë") 792 ("&euml;" "ë")
793 ("&igrave;" "ì") 793 ("&igrave;" "ì")
794 ("&iacute;" "í") 794 ("&iacute;" "í")
795 ("&icirc;" "î") 795 ("&icirc;" "î")
796 ("&iuml;" "ï") 796 ("&iuml;" "ï")
797 ("&eth;" "ð") 797 ("&eth;" "ð")
798 ("&ntilde;" "ñ") 798 ("&ntilde;" "ñ")
799 ("&nbsp;" " ") 799 ("&nbsp;" " ")
800 ("&ograve;" "ò") 800 ("&ograve;" "ò")
801 ("&oacute;" "ó") 801 ("&oacute;" "ó")
802 ("&ocirc;" "ô") 802 ("&ocirc;" "ô")
803 ("&otilde;" "õ") 803 ("&otilde;" "õ")
804 ("&ouml;" "ö") 804 ("&ouml;" "ö")
805 ("&oslash;" "ø") 805 ("&oslash;" "ø")
806 ("&ugrave;" "ù") 806 ("&ugrave;" "ù")
807 ("&uacute;" "ú") 807 ("&uacute;" "ú")
808 ("&ucirc;" "û") 808 ("&ucirc;" "û")
809 ("&uuml;" "ü") 809 ("&uuml;" "ü")
810 ("&yacute;" "ý") 810 ("&yacute;" "ý")
811 ("&thorn;" "þ") 811 ("&thorn;" "þ")
812 ("&yuml;" "ÿ"))) 812 ("&yuml;" "ÿ")))
813 813
814;;;###autoload 814;;;###autoload
815(defun iso-iso2sgml (from to &optional buffer) 815(defun iso-iso2sgml (from to &optional buffer)
diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index 4bc0400ef23..4bbb89c7087 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -1,4 +1,4 @@
1;;; iso-transl.el --- keyboard input definitions for ISO 8859-1 -*- coding: iso-8859-1 -*- 1;;; iso-transl.el --- keyboard input definitions for ISO 8859-1 -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1987, 1993-1999, 2001-2013 Free Software Foundation, 3;; Copyright (C) 1987, 1993-1999, 2001-2013 Free Software Foundation,
4;; Inc. 4;; Inc.
@@ -73,125 +73,125 @@
73;; language-specific table might override the short form for its own use. 73;; language-specific table might override the short form for its own use.
74 74
75(defvar iso-transl-char-map 75(defvar iso-transl-char-map
76 '(("* " . [? ]) 76 '(("* " . [? ])
77 (" " . [? ]) 77 (" " . [? ])
78 ("*!" . [?¡]) 78 ("*!" . [?¡])
79 ("!" . [?¡]) 79 ("!" . [?¡])
80 ("\"\"" . [?¨]) 80 ("\"\"" . [?¨])
81 ("\"A" . [?Ä]) 81 ("\"A" . [?Ä])
82 ("\"E" . [?Ë]) 82 ("\"E" . [?Ë])
83 ("\"I" . [?Ï]) 83 ("\"I" . [?Ã])
84 ("\"O" . [?Ö]) 84 ("\"O" . [?Ö])
85 ("\"U" . [?Ü]) 85 ("\"U" . [?Ü])
86 ("\"a" . [?ä]) 86 ("\"a" . [?ä])
87 ("\"e" . [?ë]) 87 ("\"e" . [?ë])
88 ("\"i" . [?ï]) 88 ("\"i" . [?ï])
89 ("\"o" . [?ö]) 89 ("\"o" . [?ö])
90 ("\"s" . [?ß]) 90 ("\"s" . [?ß])
91 ("\"u" . [?ü]) 91 ("\"u" . [?ü])
92 ("\"y" . [?ÿ]) 92 ("\"y" . [?ÿ])
93 ("''" . [?´]) 93 ("''" . [?´])
94 ("'A" . [?Á]) 94 ("'A" . [?Ã])
95 ("'E" . [?É]) 95 ("'E" . [?É])
96 ("'I" . [?Í]) 96 ("'I" . [?Ã])
97 ("'O" . [?Ó]) 97 ("'O" . [?Ó])
98 ("'U" . [?Ú]) 98 ("'U" . [?Ú])
99 ("'Y" . [?Ý]) 99 ("'Y" . [?Ã])
100 ("'a" . [?á]) 100 ("'a" . [?á])
101 ("'e" . [?é]) 101 ("'e" . [?é])
102 ("'i" . [?í]) 102 ("'i" . [?í])
103 ("'o" . [?ó]) 103 ("'o" . [?ó])
104 ("'u" . [?ú]) 104 ("'u" . [?ú])
105 ("'y" . [?ý]) 105 ("'y" . [?ý])
106 ("*$" . [?¤]) 106 ("*$" . [?¤])
107 ("$" . [?¤]) 107 ("$" . [?¤])
108 ("*+" . [?±]) 108 ("*+" . [?±])
109 ("+" . [?±]) 109 ("+" . [?±])
110 (",," . [?¸]) 110 (",," . [?¸])
111 (",C" . [?Ç]) 111 (",C" . [?Ç])
112 (",c" . [?ç]) 112 (",c" . [?ç])
113 ("*-" . [?­]) 113 ("*-" . [?­])
114 ("-" . [?­]) 114 ("-" . [?­])
115 ("*." . [?·]) 115 ("*." . [?·])
116 ("." . [?·]) 116 ("." . [?·])
117 ("//" . [?÷]) 117 ("//" . [?÷])
118 ("/A" . [?Å]) 118 ("/A" . [?Ã…])
119 ("/E" . [?Æ]) 119 ("/E" . [?Æ])
120 ("/O" . [?Ø]) 120 ("/O" . [?Ø])
121 ("/a" . [?å]) 121 ("/a" . [?Ã¥])
122 ("/e" . [?æ]) 122 ("/e" . [?æ])
123 ("/o" . [?ø]) 123 ("/o" . [?ø])
124 ("1/2" . [?½]) 124 ("1/2" . [?½])
125 ("1/4" . [?¼]) 125 ("1/4" . [?¼])
126 ("3/4" . [?¾]) 126 ("3/4" . [?¾])
127 ("*<" . [?«]) 127 ("*<" . [?«])
128 ("<" . [?«]) 128 ("<" . [?«])
129 ("*=" . [?¯]) 129 ("*=" . [?¯])
130 ("=" . [?¯]) 130 ("=" . [?¯])
131 ("*>" . [?»]) 131 ("*>" . [?»])
132 (">" . [?»]) 132 (">" . [?»])
133 ("*?" . [?¿]) 133 ("*?" . [?¿])
134 ("?" . [?¿]) 134 ("?" . [?¿])
135 ("*C" . [?©]) 135 ("*C" . [?©])
136 ("C" . [?©]) 136 ("C" . [?©])
137 ("*L" . [?£]) 137 ("*L" . [?£])
138 ("L" . [?£]) 138 ("L" . [?£])
139 ("*P" . [?¶]) 139 ("*P" . [?¶])
140 ("P" . [?¶]) 140 ("P" . [?¶])
141 ("*R" . [?®]) 141 ("*R" . [?®])
142 ("R" . [?®]) 142 ("R" . [?®])
143 ("*S" . [?§]) 143 ("*S" . [?§])
144 ("S" . [?§]) 144 ("S" . [?§])
145 ("*Y" . [?¥]) 145 ("*Y" . [?Â¥])
146 ("Y" . [?¥]) 146 ("Y" . [?Â¥])
147 ("^1" . [?¹]) 147 ("^1" . [?¹])
148 ("^2" . [?²]) 148 ("^2" . [?²])
149 ("^3" . [?³]) 149 ("^3" . [?³])
150 ("^A" . [?Â]) 150 ("^A" . [?Â])
151 ("^E" . [?Ê]) 151 ("^E" . [?Ê])
152 ("^I" . [?Î]) 152 ("^I" . [?ÃŽ])
153 ("^O" . [?Ô]) 153 ("^O" . [?Ô])
154 ("^U" . [?Û]) 154 ("^U" . [?Û])
155 ("^a" . [?â]) 155 ("^a" . [?â])
156 ("^e" . [?ê]) 156 ("^e" . [?ê])
157 ("^i" . [?î]) 157 ("^i" . [?î])
158 ("^o" . [?ô]) 158 ("^o" . [?ô])
159 ("^u" . [?û]) 159 ("^u" . [?û])
160 ("_a" . [?ª]) 160 ("_a" . [?ª])
161 ("_o" . [?º]) 161 ("_o" . [?º])
162 ("`A" . [?À]) 162 ("`A" . [?À])
163 ("`E" . [?È]) 163 ("`E" . [?È])
164 ("`I" . [?Ì]) 164 ("`I" . [?ÃŒ])
165 ("`O" . [?Ò]) 165 ("`O" . [?Ã’])
166 ("`U" . [?Ù]) 166 ("`U" . [?Ù])
167 ("`a" . [?à]) 167 ("`a" . [?à])
168 ("`e" . [?è]) 168 ("`e" . [?è])
169 ("`i" . [?ì]) 169 ("`i" . [?ì])
170 ("`o" . [?ò]) 170 ("`o" . [?ò])
171 ("`u" . [?ù]) 171 ("`u" . [?ù])
172 ("*c" . [?¢]) 172 ("*c" . [?¢])
173 ("c" . [?¢]) 173 ("c" . [?¢])
174 ("*o" . [?°]) 174 ("*o" . [?°])
175 ("o" . [?°]) 175 ("o" . [?°])
176 ("*u" . [?µ]) 176 ("*u" . [?µ])
177 ("u" . [?µ]) 177 ("u" . [?µ])
178 ("*m" . [?µ]) 178 ("*m" . [?µ])
179 ("m" . [?µ]) 179 ("m" . [?µ])
180 ("*x" . [?×]) 180 ("*x" . [?×])
181 ("x" . [?×]) 181 ("x" . [?×])
182 ("*|" . [?¦]) 182 ("*|" . [?¦])
183 ("|" . [?¦]) 183 ("|" . [?¦])
184 ("~A" . [?Ã]) 184 ("~A" . [?Ã])
185 ("~D" . [?Ð]) 185 ("~D" . [?Ã])
186 ("~N" . [?Ñ]) 186 ("~N" . [?Ñ])
187 ("~O" . [?Õ]) 187 ("~O" . [?Õ])
188 ("~T" . [?Þ]) 188 ("~T" . [?Þ])
189 ("~a" . [?ã]) 189 ("~a" . [?ã])
190 ("~d" . [?ð]) 190 ("~d" . [?ð])
191 ("~n" . [?ñ]) 191 ("~n" . [?ñ])
192 ("~o" . [?õ]) 192 ("~o" . [?õ])
193 ("~t" . [?þ]) 193 ("~t" . [?þ])
194 ("~~" . [?¬]) 194 ("~~" . [?¬])
195 ("' " . "'") 195 ("' " . "'")
196 ("` " . "`") 196 ("` " . "`")
197 ("\" " . "\"") 197 ("\" " . "\"")
@@ -205,37 +205,37 @@ sequence VECTOR. (VECTOR is normally one character long.)")
205;; Language-specific translation lists. 205;; Language-specific translation lists.
206(defvar iso-transl-language-alist 206(defvar iso-transl-language-alist
207 '(("Esperanto" 207 '(("Esperanto"
208 ("C" . [?Æ]) 208 ("C" . [?Æ])
209 ("G" . [?Ø]) 209 ("G" . [?Ø])
210 ("H" . [?¦]) 210 ("H" . [?¦])
211 ("J" . [?¬]) 211 ("J" . [?¬])
212 ("S" . [?Þ]) 212 ("S" . [?Þ])
213 ("U" . [?Ý]) 213 ("U" . [?Ã])
214 ("c" . [?æ]) 214 ("c" . [?æ])
215 ("g" . [?ø]) 215 ("g" . [?ø])
216 ("h" . [?¶]) 216 ("h" . [?¶])
217 ("j" . [?¼]) 217 ("j" . [?¼])
218 ("s" . [?þ]) 218 ("s" . [?þ])
219 ("u" . [?ý])) 219 ("u" . [?ý]))
220 ("French" 220 ("French"
221 ("C" . [?Ç]) 221 ("C" . [?Ç])
222 ("c" . [?ç])) 222 ("c" . [?ç]))
223 ("German" 223 ("German"
224 ("A" . [?Ä]) 224 ("A" . [?Ä])
225 ("O" . [?Ö]) 225 ("O" . [?Ö])
226 ("U" . [?Ü]) 226 ("U" . [?Ü])
227 ("a" . [?ä]) 227 ("a" . [?ä])
228 ("o" . [?ö]) 228 ("o" . [?ö])
229 ("s" . [?ß]) 229 ("s" . [?ß])
230 ("u" . [?ü])) 230 ("u" . [?ü]))
231 ("Portuguese" 231 ("Portuguese"
232 ("C" . [?Ç]) 232 ("C" . [?Ç])
233 ("c" . [?ç])) 233 ("c" . [?ç]))
234 ("Spanish" 234 ("Spanish"
235 ("!" . [?¡]) 235 ("!" . [?¡])
236 ("?" . [?¿]) 236 ("?" . [?¿])
237 ("N" . [?Ñ]) 237 ("N" . [?Ñ])
238 ("n" . [?ñ])))) 238 ("n" . [?ñ]))))
239 239
240(defvar iso-transl-ctl-x-8-map nil 240(defvar iso-transl-ctl-x-8-map nil
241 "Keymap for C-x 8 prefix.") 241 "Keymap for C-x 8 prefix.")
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index 98eff2a7db7..608ff811923 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -1,4 +1,4 @@
1;;; romanian.el --- support for Romanian -*- coding: iso-latin-2 -*- 1;;; romanian.el --- support for Romanian -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc.
4 4
@@ -34,7 +34,7 @@
34 (input-method . "latin-2-postfix") 34 (input-method . "latin-2-postfix")
35 (unibyte-display . iso-8859-2) 35 (unibyte-display . iso-8859-2)
36 (tutorial . "TUTORIAL.ro") 36 (tutorial . "TUTORIAL.ro")
37 (sample-text . "Bunã ziua, bine aþi venit!") 37 (sample-text . "Bună ziua, bine aÅ£i venit!")
38 (documentation . "Romanian environment using Latin-2 encoding. 38 (documentation . "Romanian environment using Latin-2 encoding.
39An environment for generic Latin-10 encoding is also available.")) 39An environment for generic Latin-10 encoding is also available."))
40 '("European")) 40 '("European"))
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 07320246c49..e57911947b1 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -5114,7 +5114,7 @@
5114 (mail-abbrevs): Declare it in XEmacs. 5114 (mail-abbrevs): Declare it in XEmacs.
5115 (mh-alias-add-alias-to-file): Remove unused code. 5115 (mh-alias-add-alias-to-file): Remove unused code.
5116 5116
51172003-02-14 Ville Skyttä <scop@xemacs.org> 51172003-02-14 Ville Skyttä <scop@xemacs.org>
5118 5118
5119 * mh-comp.el: Add autoloaded auto-mode-alist association. 5119 * mh-comp.el: Add autoloaded auto-mode-alist association.
5120 5120
@@ -11416,3 +11416,7 @@
11416 11416
11417 You should have received a copy of the GNU General Public License 11417 You should have received a copy of the GNU General Public License
11418 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 11418 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
11419
11420;; Local Variables:
11421;; coding: utf-8
11422;; End:
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index e18f4c9c77f..ec237f0f664 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1458,9 +1458,11 @@ It also eliminates runs of equal strings."
1458 'mouse-face 'highlight) 1458 'mouse-face 'highlight)
1459 (put-text-property (point) (progn (insert (car str)) (point)) 1459 (put-text-property (point) (progn (insert (car str)) (point))
1460 'mouse-face 'highlight) 1460 'mouse-face 'highlight)
1461 (add-text-properties (point) (progn (insert (cadr str)) (point)) 1461 (let ((beg (point))
1462 '(mouse-face nil 1462 (end (progn (insert (cadr str)) (point))))
1463 face completions-annotations))) 1463 (put-text-property beg end 'mouse-face nil)
1464 (font-lock-prepend-text-property beg end 'face
1465 'completions-annotations)))
1464 (cond 1466 (cond
1465 ((eq completions-format 'vertical) 1467 ((eq completions-format 'vertical)
1466 ;; Vertical format 1468 ;; Vertical format
@@ -1487,12 +1489,11 @@ See also `display-completion-list'.")
1487 1489
1488(defface completions-first-difference 1490(defface completions-first-difference
1489 '((t (:inherit bold))) 1491 '((t (:inherit bold)))
1490 "Face put on the first uncommon character in completions in *Completions* buffer." 1492 "Face added on the first uncommon character in completions in *Completions* buffer."
1491 :group 'completion) 1493 :group 'completion)
1492 1494
1493(defface completions-common-part 1495(defface completions-common-part '((t nil))
1494 '((t (:inherit default))) 1496 "Face added on the common prefix substring in completions in *Completions* buffer.
1495 "Face put on the common prefix substring in completions in *Completions* buffer.
1496The idea of `completions-common-part' is that you can use it to 1497The idea of `completions-common-part' is that you can use it to
1497make the common parts less visible than normal, so that the rest 1498make the common parts less visible than normal, so that the rest
1498of the differing parts is, by contrast, slightly highlighted." 1499of the differing parts is, by contrast, slightly highlighted."
@@ -1513,17 +1514,18 @@ of the differing parts is, by contrast, slightly highlighted."
1513 (car (setq elem (cons (copy-sequence (car elem)) 1514 (car (setq elem (cons (copy-sequence (car elem))
1514 (cdr elem)))) 1515 (cdr elem))))
1515 (setq elem (copy-sequence elem))))) 1516 (setq elem (copy-sequence elem)))))
1516 (put-text-property 0 1517 (font-lock-prepend-text-property
1517 ;; If completion-boundaries returns incorrect 1518 0
1518 ;; values, all-completions may return strings 1519 ;; If completion-boundaries returns incorrect
1519 ;; that don't contain the prefix. 1520 ;; values, all-completions may return strings
1520 (min com-str-len (length str)) 1521 ;; that don't contain the prefix.
1521 'font-lock-face 'completions-common-part 1522 (min com-str-len (length str))
1522 str) 1523 'face 'completions-common-part str)
1523 (if (> (length str) com-str-len) 1524 (if (> (length str) com-str-len)
1524 (put-text-property com-str-len (1+ com-str-len) 1525 (font-lock-prepend-text-property com-str-len (1+ com-str-len)
1525 'font-lock-face 'completions-first-difference 1526 'face
1526 str))) 1527 'completions-first-difference
1528 str)))
1527 elem) 1529 elem)
1528 completions) 1530 completions)
1529 base-size)))) 1531 base-size))))
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 45f15b14a54..106aab2ac0a 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -1,9 +1,9 @@
1;;; eudc-bob.el --- Binary Objects Support for EUDC 1;;; eudc-bob.el --- Binary Objects Support for EUDC -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1999-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@cpe.fr> 5;; Author: Oscar Figueiredo <oscar@cpe.fr>
6;; Maintainer: Pavel Janík <Pavel@Janik.cz> 6;; Maintainer: Pavel Janík <Pavel@Janik.cz>
7;; Keywords: comm 7;; Keywords: comm
8;; Package: eudc 8;; Package: eudc
9 9
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index 690a5f15c40..b43a8c631e3 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -1,9 +1,9 @@
1;;; eudc-export.el --- functions to export EUDC query results 1;;; eudc-export.el --- functions to export EUDC query results -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1998-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@cpe.fr> 5;; Author: Oscar Figueiredo <oscar@cpe.fr>
6;; Maintainer: Pavel Janík <Pavel@Janik.cz> 6;; Maintainer: Pavel Janík <Pavel@Janik.cz>
7;; Keywords: comm 7;; Keywords: comm
8;; Package: eudc 8;; Package: eudc
9 9
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 0322fa766f3..a8a51b7d61b 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -1,9 +1,9 @@
1;;; eudc-hotlist.el --- hotlist management for EUDC 1;;; eudc-hotlist.el --- hotlist management for EUDC -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1998-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@cpe.fr> 5;; Author: Oscar Figueiredo <oscar@cpe.fr>
6;; Maintainer: Pavel Janík <Pavel@Janik.cz> 6;; Maintainer: Pavel Janík <Pavel@Janik.cz>
7;; Keywords: comm 7;; Keywords: comm
8;; Package: eudc 8;; Package: eudc
9 9
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index c2cc0154151..d53fd83eee7 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -1,9 +1,9 @@
1;;; eudc-vars.el --- Emacs Unified Directory Client 1;;; eudc-vars.el --- Emacs Unified Directory Client -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1998-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@cpe.fr> 5;; Author: Oscar Figueiredo <oscar@cpe.fr>
6;; Maintainer: Pavel Janík <Pavel@Janik.cz> 6;; Maintainer: Pavel Janík <Pavel@Janik.cz>
7;; Keywords: comm 7;; Keywords: comm
8;; Package: eudc 8;; Package: eudc
9 9
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 621b9b90879..ef09267f854 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,9 +1,9 @@
1;;; eudc.el --- Emacs Unified Directory Client 1;;; eudc.el --- Emacs Unified Directory Client -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1998-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@cpe.fr> 5;; Author: Oscar Figueiredo <oscar@cpe.fr>
6;; Maintainer: Pavel Janík <Pavel@Janik.cz> 6;; Maintainer: Pavel Janík <Pavel@Janik.cz>
7;; Keywords: comm 7;; Keywords: comm
8 8
9;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index 58d94622486..9f6dba703b1 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -1,9 +1,9 @@
1;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend 1;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1998-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@cpe.fr> 5;; Author: Oscar Figueiredo <oscar@cpe.fr>
6;; Maintainer: Pavel Janík <Pavel@Janik.cz> 6;; Maintainer: Pavel Janík <Pavel@Janik.cz>
7;; Keywords: comm 7;; Keywords: comm
8;; Package: eudc 8;; Package: eudc
9 9
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index 23eed4b3c0a..d0ba47ad753 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -1,9 +1,9 @@
1;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend 1;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1998-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@cpe.fr> 5;; Author: Oscar Figueiredo <oscar@cpe.fr>
6;; Maintainer: Pavel Janík <Pavel@Janik.cz> 6;; Maintainer: Pavel Janík <Pavel@Janik.cz>
7;; Keywords: comm 7;; Keywords: comm
8;; Package: eudc 8;; Package: eudc
9 9
diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el
index 3033e945c24..1796f2d9806 100644
--- a/lisp/net/eudcb-ph.el
+++ b/lisp/net/eudcb-ph.el
@@ -1,9 +1,9 @@
1;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend 1;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1998-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
4 4
5;; Author: Oscar Figueiredo <oscar@cpe.fr> 5;; Author: Oscar Figueiredo <oscar@cpe.fr>
6;; Maintainer: Pavel Janík <Pavel@Janik.cz> 6;; Maintainer: Pavel Janík <Pavel@Janik.cz>
7;; Keywords: comm 7;; Keywords: comm
8;; Package: eudc 8;; Package: eudc
9 9
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 81c4d5ccced..d4639817b18 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -384,25 +384,30 @@ Not actually used. Use `(format \"%o\" i)' instead?"
384 trash))) 384 trash)))
385 (delete-file filename))))) 385 (delete-file filename)))))
386 386
387;; RECURSIVE has been introduced with Emacs 23.2. 387;; RECURSIVE has been introduced with Emacs 23.2. TRASH has been
388(defun tramp-compat-delete-directory (directory &optional recursive) 388;; introduced with Emacs 24.1.
389(defun tramp-compat-delete-directory (directory &optional recursive trash)
389 "Like `delete-directory' for Tramp files (compat function)." 390 "Like `delete-directory' for Tramp files (compat function)."
390 (if (null recursive) 391 (condition-case nil
391 (delete-directory directory) 392 (cond
392 (condition-case nil 393 (trash
393 (tramp-compat-funcall 'delete-directory directory recursive) 394 (tramp-compat-funcall 'delete-directory directory recursive trash))
394 ;; This Emacs version does not support the RECURSIVE flag. We 395 (recursive
395 ;; use the implementation from Emacs 23.2. 396 (tramp-compat-funcall 'delete-directory directory recursive))
396 (wrong-number-of-arguments 397 (t
397 (setq directory (directory-file-name (expand-file-name directory))) 398 (delete-directory directory)))
398 (if (not (file-symlink-p directory)) 399 ;; This Emacs version does not support the RECURSIVE or TRASH flag. We
399 (mapc (lambda (file) 400 ;; use the implementation from Emacs 23.2.
400 (if (eq t (car (file-attributes file))) 401 (wrong-number-of-arguments
401 (tramp-compat-delete-directory file recursive) 402 (setq directory (directory-file-name (expand-file-name directory)))
402 (delete-file file))) 403 (if (not (file-symlink-p directory))
403 (directory-files 404 (mapc (lambda (file)
404 directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))) 405 (if (eq t (car (file-attributes file)))
405 (delete-directory directory))))) 406 (tramp-compat-delete-directory file recursive trash)
407 (tramp-compat-delete-file file trash)))
408 (directory-files
409 directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
410 (delete-directory directory))))
406 411
407;; `number-sequence' does not exist in XEmacs. Implementation is 412;; `number-sequence' does not exist in XEmacs. Implementation is
408;; taken from Emacs 23. 413;; taken from Emacs 23.
diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el
index 18cf87a4c6f..2c0adf32d12 100644
--- a/lisp/obsolete/iso-insert.el
+++ b/lisp/obsolete/iso-insert.el
@@ -1,4 +1,4 @@
1;;; iso-insert.el --- insert functions for ISO 8859/1 -*- coding: iso-8859-1;-*- 1;;; iso-insert.el --- insert functions for ISO 8859/1 -*- coding: utf-8;-*-
2 2
3;; Copyright (C) 1987, 1994, 2001-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1987, 1994, 2001-2013 Free Software Foundation, Inc.
4 4
@@ -31,482 +31,482 @@
31 31
32(defun insert-no-break-space () 32(defun insert-no-break-space ()
33 (interactive "*") 33 (interactive "*")
34 (insert ?\ ) 34 (insert ?\ )
35) 35)
36 36
37(defun insert-inverted-exclamation-mark () 37(defun insert-inverted-exclamation-mark ()
38 (interactive "*") 38 (interactive "*")
39 (insert ?\¡) 39 (insert ?\¡)
40) 40)
41 41
42(defun insert-cent-sign () 42(defun insert-cent-sign ()
43 (interactive "*") 43 (interactive "*")
44 (insert ?\¢) 44 (insert ?\¢)
45) 45)
46 46
47(defun insert-pound-sign () 47(defun insert-pound-sign ()
48 (interactive "*") 48 (interactive "*")
49 (insert ?\£) 49 (insert ?\£)
50) 50)
51 51
52(defun insert-general-currency-sign () 52(defun insert-general-currency-sign ()
53 (interactive "*") 53 (interactive "*")
54 (insert ?\¤) 54 (insert ?\¤)
55) 55)
56 56
57(defun insert-yen-sign () 57(defun insert-yen-sign ()
58 (interactive "*") 58 (interactive "*")
59 (insert ?\¥) 59 (insert ?\Â¥)
60) 60)
61 61
62(defun insert-broken-vertical-line () 62(defun insert-broken-vertical-line ()
63 (interactive "*") 63 (interactive "*")
64 (insert ?\¦) 64 (insert ?\¦)
65) 65)
66 66
67(defun insert-section-sign () 67(defun insert-section-sign ()
68 (interactive "*") 68 (interactive "*")
69 (insert ?\§) 69 (insert ?\§)
70) 70)
71 71
72(defun insert-diaeresis () 72(defun insert-diaeresis ()
73 (interactive "*") 73 (interactive "*")
74 (insert ?\¨) 74 (insert ?\¨)
75) 75)
76 76
77(defun insert-copyright-sign () 77(defun insert-copyright-sign ()
78 (interactive "*") 78 (interactive "*")
79 (insert ?\©) 79 (insert ?\©)
80) 80)
81 81
82(defun insert-ordinal-indicator-feminine () 82(defun insert-ordinal-indicator-feminine ()
83 (interactive "*") 83 (interactive "*")
84 (insert ?\ª) 84 (insert ?\ª)
85) 85)
86 86
87(defun insert-angle-quotation-mark-left () 87(defun insert-angle-quotation-mark-left ()
88 (interactive "*") 88 (interactive "*")
89 (insert ?\«) 89 (insert ?\«)
90) 90)
91 91
92(defun insert-not-sign () 92(defun insert-not-sign ()
93 (interactive "*") 93 (interactive "*")
94 (insert ?\¬) 94 (insert ?\¬)
95) 95)
96 96
97(defun insert-soft-hyphen () 97(defun insert-soft-hyphen ()
98 (interactive "*") 98 (interactive "*")
99 (insert ?\­) 99 (insert ?\­)
100) 100)
101 101
102(defun insert-registered-sign () 102(defun insert-registered-sign ()
103 (interactive "*") 103 (interactive "*")
104 (insert ?\®) 104 (insert ?\®)
105) 105)
106 106
107(defun insert-macron () 107(defun insert-macron ()
108 (interactive "*") 108 (interactive "*")
109 (insert ?\¯) 109 (insert ?\¯)
110) 110)
111 111
112(defun insert-degree-sign () 112(defun insert-degree-sign ()
113 (interactive "*") 113 (interactive "*")
114 (insert ?\°) 114 (insert ?\°)
115) 115)
116 116
117(defun insert-plus-or-minus-sign () 117(defun insert-plus-or-minus-sign ()
118 (interactive "*") 118 (interactive "*")
119 (insert ?\±) 119 (insert ?\±)
120) 120)
121 121
122(defun insert-superscript-two () 122(defun insert-superscript-two ()
123 (interactive "*") 123 (interactive "*")
124 (insert ?\²) 124 (insert ?\²)
125) 125)
126 126
127(defun insert-superscript-three () 127(defun insert-superscript-three ()
128 (interactive "*") 128 (interactive "*")
129 (insert ?\³) 129 (insert ?\³)
130) 130)
131 131
132(defun insert-acute-accent () 132(defun insert-acute-accent ()
133 (interactive "*") 133 (interactive "*")
134 (insert ?\´) 134 (insert ?\´)
135) 135)
136 136
137(defun insert-micro-sign () 137(defun insert-micro-sign ()
138 (interactive "*") 138 (interactive "*")
139 (insert ?\µ) 139 (insert ?\µ)
140) 140)
141 141
142(defun insert-pilcrow () 142(defun insert-pilcrow ()
143 (interactive "*") 143 (interactive "*")
144 (insert ?\¶) 144 (insert ?\¶)
145) 145)
146 146
147(defun insert-middle-dot () 147(defun insert-middle-dot ()
148 (interactive "*") 148 (interactive "*")
149 (insert ?\·) 149 (insert ?\·)
150) 150)
151 151
152(defun insert-cedilla () 152(defun insert-cedilla ()
153 (interactive "*") 153 (interactive "*")
154 (insert ?\¸) 154 (insert ?\¸)
155) 155)
156 156
157(defun insert-superscript-one () 157(defun insert-superscript-one ()
158 (interactive "*") 158 (interactive "*")
159 (insert ?\¹) 159 (insert ?\¹)
160) 160)
161 161
162(defun insert-ordinal-indicator-masculine () 162(defun insert-ordinal-indicator-masculine ()
163 (interactive "*") 163 (interactive "*")
164 (insert ?\º) 164 (insert ?\º)
165) 165)
166 166
167(defun insert-angle-quotation-mark-right () 167(defun insert-angle-quotation-mark-right ()
168 (interactive "*") 168 (interactive "*")
169 (insert ?\») 169 (insert ?\»)
170) 170)
171 171
172(defun insert-fraction-one-quarter () 172(defun insert-fraction-one-quarter ()
173 (interactive "*") 173 (interactive "*")
174 (insert ?\¼) 174 (insert ?\¼)
175) 175)
176 176
177(defun insert-fraction-one-half () 177(defun insert-fraction-one-half ()
178 (interactive "*") 178 (interactive "*")
179 (insert ?\½) 179 (insert ?\½)
180) 180)
181 181
182(defun insert-fraction-three-quarters () 182(defun insert-fraction-three-quarters ()
183 (interactive "*") 183 (interactive "*")
184 (insert ?\¾) 184 (insert ?\¾)
185) 185)
186 186
187(defun insert-inverted-question-mark () 187(defun insert-inverted-question-mark ()
188 (interactive "*") 188 (interactive "*")
189 (insert ?\¿) 189 (insert ?\¿)
190) 190)
191 191
192(defun insert-A-grave () 192(defun insert-A-grave ()
193 (interactive "*") 193 (interactive "*")
194 (insert ?\À) 194 (insert ?\À)
195) 195)
196 196
197(defun insert-A-acute () 197(defun insert-A-acute ()
198 (interactive "*") 198 (interactive "*")
199 (insert ?\Á) 199 (insert ?\Ã)
200) 200)
201 201
202(defun insert-A-circumflex () 202(defun insert-A-circumflex ()
203 (interactive "*") 203 (interactive "*")
204 (insert ?\Â) 204 (insert ?\Â)
205) 205)
206 206
207(defun insert-A-tilde () 207(defun insert-A-tilde ()
208 (interactive "*") 208 (interactive "*")
209 (insert ?\Ã) 209 (insert ?\Ã)
210) 210)
211 211
212(defun insert-A-umlaut () 212(defun insert-A-umlaut ()
213 (interactive "*") 213 (interactive "*")
214 (insert ?\Ä) 214 (insert ?\Ä)
215) 215)
216 216
217(defun insert-A-ring () 217(defun insert-A-ring ()
218 (interactive "*") 218 (interactive "*")
219 (insert ?\Å) 219 (insert ?\Ã…)
220) 220)
221 221
222(defun insert-AE () 222(defun insert-AE ()
223 (interactive "*") 223 (interactive "*")
224 (insert ?\Æ) 224 (insert ?\Æ)
225) 225)
226 226
227(defun insert-C-cedilla () 227(defun insert-C-cedilla ()
228 (interactive "*") 228 (interactive "*")
229 (insert ?\Ç) 229 (insert ?\Ç)
230) 230)
231 231
232(defun insert-E-grave () 232(defun insert-E-grave ()
233 (interactive "*") 233 (interactive "*")
234 (insert ?\È) 234 (insert ?\È)
235) 235)
236 236
237(defun insert-E-acute () 237(defun insert-E-acute ()
238 (interactive "*") 238 (interactive "*")
239 (insert ?\É) 239 (insert ?\É)
240) 240)
241 241
242(defun insert-E-circumflex () 242(defun insert-E-circumflex ()
243 (interactive "*") 243 (interactive "*")
244 (insert ?\Ê) 244 (insert ?\Ê)
245) 245)
246 246
247(defun insert-E-umlaut () 247(defun insert-E-umlaut ()
248 (interactive "*") 248 (interactive "*")
249 (insert ?\Ë) 249 (insert ?\Ë)
250) 250)
251 251
252(defun insert-I-grave () 252(defun insert-I-grave ()
253 (interactive "*") 253 (interactive "*")
254 (insert ?\Ì) 254 (insert ?\ÃŒ)
255) 255)
256 256
257(defun insert-I-acute () 257(defun insert-I-acute ()
258 (interactive "*") 258 (interactive "*")
259 (insert ?\Í) 259 (insert ?\Ã)
260) 260)
261 261
262(defun insert-I-circumflex () 262(defun insert-I-circumflex ()
263 (interactive "*") 263 (interactive "*")
264 (insert ?\Î) 264 (insert ?\ÃŽ)
265) 265)
266 266
267(defun insert-I-umlaut () 267(defun insert-I-umlaut ()
268 (interactive "*") 268 (interactive "*")
269 (insert ?\Ï) 269 (insert ?\Ã)
270) 270)
271 271
272(defun insert-D-stroke () 272(defun insert-D-stroke ()
273 (interactive "*") 273 (interactive "*")
274 (insert ?\Ð) 274 (insert ?\Ã)
275) 275)
276 276
277(defun insert-N-tilde () 277(defun insert-N-tilde ()
278 (interactive "*") 278 (interactive "*")
279 (insert ?\Ñ) 279 (insert ?\Ñ)
280) 280)
281 281
282(defun insert-O-grave () 282(defun insert-O-grave ()
283 (interactive "*") 283 (interactive "*")
284 (insert ?\Ò) 284 (insert ?\Ã’)
285) 285)
286 286
287(defun insert-O-acute () 287(defun insert-O-acute ()
288 (interactive "*") 288 (interactive "*")
289 (insert ?\Ó) 289 (insert ?\Ó)
290) 290)
291 291
292(defun insert-O-circumflex () 292(defun insert-O-circumflex ()
293 (interactive "*") 293 (interactive "*")
294 (insert ?\Ô) 294 (insert ?\Ô)
295) 295)
296 296
297(defun insert-O-tilde () 297(defun insert-O-tilde ()
298 (interactive "*") 298 (interactive "*")
299 (insert ?\Õ) 299 (insert ?\Õ)
300) 300)
301 301
302(defun insert-O-umlaut () 302(defun insert-O-umlaut ()
303 (interactive "*") 303 (interactive "*")
304 (insert ?\Ö) 304 (insert ?\Ö)
305) 305)
306 306
307(defun insert-multiplication-sign () 307(defun insert-multiplication-sign ()
308 (interactive "*") 308 (interactive "*")
309 (insert ?\×) 309 (insert ?\×)
310) 310)
311 311
312(defun insert-O-slash () 312(defun insert-O-slash ()
313 (interactive "*") 313 (interactive "*")
314 (insert ?\Ø) 314 (insert ?\Ø)
315) 315)
316 316
317(defun insert-U-grave () 317(defun insert-U-grave ()
318 (interactive "*") 318 (interactive "*")
319 (insert ?\Ù) 319 (insert ?\Ù)
320) 320)
321 321
322(defun insert-U-acute () 322(defun insert-U-acute ()
323 (interactive "*") 323 (interactive "*")
324 (insert ?\Ú) 324 (insert ?\Ú)
325) 325)
326 326
327(defun insert-U-circumflex () 327(defun insert-U-circumflex ()
328 (interactive "*") 328 (interactive "*")
329 (insert ?\Û) 329 (insert ?\Û)
330) 330)
331 331
332(defun insert-U-umlaut () 332(defun insert-U-umlaut ()
333 (interactive "*") 333 (interactive "*")
334 (insert ?\Ü) 334 (insert ?\Ü)
335) 335)
336 336
337(defun insert-Y-acute () 337(defun insert-Y-acute ()
338 (interactive "*") 338 (interactive "*")
339 (insert ?\Ý) 339 (insert ?\Ã)
340) 340)
341 341
342(defun insert-THORN () 342(defun insert-THORN ()
343 (interactive "*") 343 (interactive "*")
344 (insert ?\Þ) 344 (insert ?\Þ)
345) 345)
346 346
347(defun insert-ss () 347(defun insert-ss ()
348 (interactive "*") 348 (interactive "*")
349 (insert ?\ß) 349 (insert ?\ß)
350) 350)
351 351
352(defun insert-a-grave () 352(defun insert-a-grave ()
353 (interactive "*") 353 (interactive "*")
354 (insert ?\à) 354 (insert ?\à)
355) 355)
356 356
357(defun insert-a-acute () 357(defun insert-a-acute ()
358 (interactive "*") 358 (interactive "*")
359 (insert ?\á) 359 (insert ?\á)
360) 360)
361 361
362(defun insert-a-circumflex () 362(defun insert-a-circumflex ()
363 (interactive "*") 363 (interactive "*")
364 (insert ?\â) 364 (insert ?\â)
365) 365)
366 366
367(defun insert-a-tilde () 367(defun insert-a-tilde ()
368 (interactive "*") 368 (interactive "*")
369 (insert ?\ã) 369 (insert ?\ã)
370) 370)
371 371
372(defun insert-a-umlaut () 372(defun insert-a-umlaut ()
373 (interactive "*") 373 (interactive "*")
374 (insert ?\ä) 374 (insert ?\ä)
375) 375)
376 376
377(defun insert-a-ring () 377(defun insert-a-ring ()
378 (interactive "*") 378 (interactive "*")
379 (insert ?\å) 379 (insert ?\Ã¥)
380) 380)
381 381
382(defun insert-ae () 382(defun insert-ae ()
383 (interactive "*") 383 (interactive "*")
384 (insert ?\æ) 384 (insert ?\æ)
385) 385)
386 386
387(defun insert-c-cedilla () 387(defun insert-c-cedilla ()
388 (interactive "*") 388 (interactive "*")
389 (insert ?\ç) 389 (insert ?\ç)
390) 390)
391 391
392(defun insert-e-grave () 392(defun insert-e-grave ()
393 (interactive "*") 393 (interactive "*")
394 (insert ?\è) 394 (insert ?\è)
395) 395)
396 396
397(defun insert-e-acute () 397(defun insert-e-acute ()
398 (interactive "*") 398 (interactive "*")
399 (insert ?\é) 399 (insert ?\é)
400) 400)
401 401
402(defun insert-e-circumflex () 402(defun insert-e-circumflex ()
403 (interactive "*") 403 (interactive "*")
404 (insert ?\ê) 404 (insert ?\ê)
405) 405)
406 406
407(defun insert-e-umlaut () 407(defun insert-e-umlaut ()
408 (interactive "*") 408 (interactive "*")
409 (insert ?\ë) 409 (insert ?\ë)
410) 410)
411 411
412(defun insert-i-grave () 412(defun insert-i-grave ()
413 (interactive "*") 413 (interactive "*")
414 (insert ?\ì) 414 (insert ?\ì)
415) 415)
416 416
417(defun insert-i-acute () 417(defun insert-i-acute ()
418 (interactive "*") 418 (interactive "*")
419 (insert ?\í) 419 (insert ?\í)
420) 420)
421 421
422(defun insert-i-circumflex () 422(defun insert-i-circumflex ()
423 (interactive "*") 423 (interactive "*")
424 (insert ?\î) 424 (insert ?\î)
425) 425)
426 426
427(defun insert-i-umlaut () 427(defun insert-i-umlaut ()
428 (interactive "*") 428 (interactive "*")
429 (insert ?\ï) 429 (insert ?\ï)
430) 430)
431 431
432(defun insert-d-stroke () 432(defun insert-d-stroke ()
433 (interactive "*") 433 (interactive "*")
434 (insert ?\ð) 434 (insert ?\ð)
435) 435)
436 436
437(defun insert-n-tilde () 437(defun insert-n-tilde ()
438 (interactive "*") 438 (interactive "*")
439 (insert ?\ñ) 439 (insert ?\ñ)
440) 440)
441 441
442(defun insert-o-grave () 442(defun insert-o-grave ()
443 (interactive "*") 443 (interactive "*")
444 (insert ?\ò) 444 (insert ?\ò)
445) 445)
446 446
447(defun insert-o-acute () 447(defun insert-o-acute ()
448 (interactive "*") 448 (interactive "*")
449 (insert ?\ó) 449 (insert ?\ó)
450) 450)
451 451
452(defun insert-o-circumflex () 452(defun insert-o-circumflex ()
453 (interactive "*") 453 (interactive "*")
454 (insert ?\ô) 454 (insert ?\ô)
455) 455)
456 456
457(defun insert-o-tilde () 457(defun insert-o-tilde ()
458 (interactive "*") 458 (interactive "*")
459 (insert ?\õ) 459 (insert ?\õ)
460) 460)
461 461
462(defun insert-o-umlaut () 462(defun insert-o-umlaut ()
463 (interactive "*") 463 (interactive "*")
464 (insert ?\ö) 464 (insert ?\ö)
465) 465)
466 466
467(defun insert-division-sign () 467(defun insert-division-sign ()
468 (interactive "*") 468 (interactive "*")
469 (insert ?\÷) 469 (insert ?\÷)
470) 470)
471 471
472(defun insert-o-slash () 472(defun insert-o-slash ()
473 (interactive "*") 473 (interactive "*")
474 (insert ?\ø) 474 (insert ?\ø)
475) 475)
476 476
477(defun insert-u-grave () 477(defun insert-u-grave ()
478 (interactive "*") 478 (interactive "*")
479 (insert ?\ù) 479 (insert ?\ù)
480) 480)
481 481
482(defun insert-u-acute () 482(defun insert-u-acute ()
483 (interactive "*") 483 (interactive "*")
484 (insert ?\ú) 484 (insert ?\ú)
485) 485)
486 486
487(defun insert-u-circumflex () 487(defun insert-u-circumflex ()
488 (interactive "*") 488 (interactive "*")
489 (insert ?\û) 489 (insert ?\û)
490) 490)
491 491
492(defun insert-u-umlaut () 492(defun insert-u-umlaut ()
493 (interactive "*") 493 (interactive "*")
494 (insert ?\ü) 494 (insert ?\ü)
495) 495)
496 496
497(defun insert-y-acute () 497(defun insert-y-acute ()
498 (interactive "*") 498 (interactive "*")
499 (insert ?\ý) 499 (insert ?\ý)
500) 500)
501 501
502(defun insert-thorn () 502(defun insert-thorn ()
503 (interactive "*") 503 (interactive "*")
504 (insert ?\þ) 504 (insert ?\þ)
505) 505)
506 506
507(defun insert-y-umlaut () 507(defun insert-y-umlaut ()
508 (interactive "*") 508 (interactive "*")
509 (insert ?\ÿ) 509 (insert ?\ÿ)
510) 510)
511 511
512(defvar 8859-1-map nil "Keymap for ISO 8859/1 character insertion.") 512(defvar 8859-1-map nil "Keymap for ISO 8859/1 character insertion.")
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index c33b70224fa..3b1c6863f54 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -275,7 +275,7 @@ will also unescape &#nn;."
275 ))) 275 )))
276 org-str)))) 276 org-str))))
277 277
278;; (let* ((str1 "a quote: \", an amp: &, lt: <; over 256: öåäÖÅÄ") 278;; (let* ((str1 "a quote: \", an amp: &, lt: <; over 256: öåäÖÅÄ")
279;; (str2 (org-freemind-escape-str-from-org str1)) 279;; (str2 (org-freemind-escape-str-from-org str1))
280;; (str3 (org-freemind-unescape-str-to-org str2))) 280;; (str3 (org-freemind-unescape-str-to-org str2)))
281;; (unless (string= str1 str3) 281;; (unless (string= str1 str3)
@@ -1221,6 +1221,7 @@ PATH should be a list of steps, where each step has the form
1221 1221
1222;; Local variables: 1222;; Local variables:
1223;; generated-autoload-file: "org-loaddefs.el" 1223;; generated-autoload-file: "org-loaddefs.el"
1224;; coding: utf-8
1224;; End: 1225;; End:
1225 1226
1226;;; org-freemind.el ends here 1227;;; org-freemind.el ends here
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 10493093aad..665e98a69b2 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -1,4 +1,4 @@
1;;; bubbles.el --- Puzzle game for Emacs 1;;; bubbles.el --- Puzzle game for Emacs -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 2007-2013 Free Software Foundation, Inc. 3;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
4 4
@@ -198,7 +198,7 @@ types are present."
198 :group 'bubbles) 198 :group 'bubbles)
199 199
200(defcustom bubbles-chars 200(defcustom bubbles-chars
201 '(?+ ?O ?# ?X ?. ?* ?& ?§) 201 '(?+ ?O ?# ?X ?. ?* ?& ?§)
202 "Characters used for bubbles. 202 "Characters used for bubbles.
203Note that the actual number of different bubbles is determined by 203Note that the actual number of different bubbles is determined by
204the number of colors, see `bubbles-colors'." 204the number of colors, see `bubbles-colors'."
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index de6c198092e..63b09895e85 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -1,4 +1,4 @@
1;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: iso-latin-1; -*- 1;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: utf-8; -*-
2 2
3;; Copyright (C) 1996, 2001-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1996, 2001-2013 Free Software Foundation, Inc.
4 4
@@ -170,15 +170,15 @@ Variables: `handwrite-linespace' (default 12)
170 (textp) 170 (textp)
171 (ps-buf-name) ;name of the PostScript buffer 171 (ps-buf-name) ;name of the PostScript buffer
172 (trans-table 172 (trans-table
173 '(("ÿ" . "264") ("á" . "207") ("à" . "210") ("â" . "211") 173 '(("ÿ" . "264") ("á" . "207") ("à" . "210") ("â" . "211")
174 ("ä" . "212") ("ã" . "213") ("å" . "214") ("é" . "216") 174 ("ä" . "212") ("ã" . "213") ("Ã¥" . "214") ("é" . "216")
175 ("è" . "217") ("ê" . "220") ("ë" . "221") ("í" . "222") 175 ("è" . "217") ("ê" . "220") ("ë" . "221") ("í" . "222")
176 ("ì" . "223") ("î" . "224") ("ï" . "225") ("ó" . "227") 176 ("ì" . "223") ("î" . "224") ("ï" . "225") ("ó" . "227")
177 ("ò" . "230") ("ô" . "231") ("ö" . "232") ("õ" . "233") 177 ("ò" . "230") ("ô" . "231") ("ö" . "232") ("õ" . "233")
178 ("ú" . "234") ("ù" . "235") ("û" . "236") ("ü" . "237") 178 ("ú" . "234") ("ù" . "235") ("û" . "236") ("ü" . "237")
179 ("ß" . "247") ("°" . "241") ("®" . "250") ("©" . "251") 179 ("ß" . "247") ("°" . "241") ("®" . "250") ("©" . "251")
180 ("ij" . "264") ("ç" . "215") ("§" . "244") ("ñ" . "226") 180 ("ij" . "264") ("ç" . "215") ("§" . "244") ("ñ" . "226")
181 ("£" . "243"))) 181 ("£" . "243")))
182 (escape-table '("\\\\" "(" ")")) ; \\ comes first to not work 182 (escape-table '("\\\\" "(" ")")) ; \\ comes first to not work
183 ; on inserted backslashes 183 ; on inserted backslashes
184 line) 184 line)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 977bc755e32..368b1fc50dc 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1,4 +1,4 @@
1;;; cc-engine.el --- core syntax guessing engine for CC mode 1;;; cc-engine.el --- core syntax guessing engine for CC mode -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1985, 1987, 1992-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1985, 1987, 1992-2013 Free Software Foundation, Inc.
4 4
@@ -2280,25 +2280,25 @@ comment at the start of cc-engine.el for more info."
2280 (while (and c (> (car c) c-state-semi-nonlit-pos-cache-limit)) 2280 (while (and c (> (car c) c-state-semi-nonlit-pos-cache-limit))
2281 (setq c (cdr c))) 2281 (setq c (cdr c)))
2282 (setq c-state-semi-nonlit-pos-cache c) 2282 (setq c-state-semi-nonlit-pos-cache c)
2283 2283
2284 (while (and c (> (car c) here)) 2284 (while (and c (> (car c) here))
2285 (setq high-pos (car c)) 2285 (setq high-pos (car c))
2286 (setq c (cdr c))) 2286 (setq c (cdr c)))
2287 (setq pos (or (car c) (point-min))) 2287 (setq pos (or (car c) (point-min)))
2288 2288
2289 (unless high-pos 2289 (unless high-pos
2290 (while 2290 (while
2291 ;; Add an element to `c-state-semi-nonlit-pos-cache' each iteration. 2291 ;; Add an element to `c-state-semi-nonlit-pos-cache' each iteration.
2292 (and 2292 (and
2293 (<= (setq npos (+ pos c-state-nonlit-pos-interval)) here) 2293 (<= (setq npos (+ pos c-state-nonlit-pos-interval)) here)
2294 2294
2295 ;; Test for being in a literal. If so, go to after it. 2295 ;; Test for being in a literal. If so, go to after it.
2296 (progn 2296 (progn
2297 (setq lit (car (cddr (c-state-pp-to-literal pos npos)))) 2297 (setq lit (car (cddr (c-state-pp-to-literal pos npos))))
2298 (or (null lit) 2298 (or (null lit)
2299 (prog1 (<= (cdr lit) here) 2299 (prog1 (<= (cdr lit) here)
2300 (setq npos (cdr lit)))))) 2300 (setq npos (cdr lit))))))
2301 2301
2302 (setq pos npos) 2302 (setq pos npos)
2303 (setq c-state-semi-nonlit-pos-cache 2303 (setq c-state-semi-nonlit-pos-cache
2304 (cons pos c-state-semi-nonlit-pos-cache)))) 2304 (cons pos c-state-semi-nonlit-pos-cache))))
@@ -2606,11 +2606,11 @@ comment at the start of cc-engine.el for more info."
2606 ;; OLD: { (.) {...........} 2606 ;; OLD: { (.) {...........}
2607 ;; ^ ^ 2607 ;; ^ ^
2608 ;; FROM HERE 2608 ;; FROM HERE
2609 ;; 2609 ;;
2610 ;; NEW: { {....} (.) {......... 2610 ;; NEW: { {....} (.) {.........
2611 ;; ^ ^ ^ 2611 ;; ^ ^ ^
2612 ;; LOWER BRACE PAIR HERE or HERE 2612 ;; LOWER BRACE PAIR HERE or HERE
2613 ;; 2613 ;;
2614 ;; This routine should be fast. Since it can get called a LOT, we maintain 2614 ;; This routine should be fast. Since it can get called a LOT, we maintain
2615 ;; `c-state-brace-pair-desert', a small cache of "failures", such that we 2615 ;; `c-state-brace-pair-desert', a small cache of "failures", such that we
2616 ;; reduce the time wasted in repeated fruitless searches in brace deserts. 2616 ;; reduce the time wasted in repeated fruitless searches in brace deserts.
@@ -2907,7 +2907,7 @@ comment at the start of cc-engine.el for more info."
2907 start-point)) 2907 start-point))
2908 (goto-char pos) 2908 (goto-char pos)
2909 (while (and c-state-cache 2909 (while (and c-state-cache
2910 (or (numberp (car c-state-cache)) ; Have we a { at all? 2910 (or (numberp (car c-state-cache)) ; Have we a { at all?
2911 (cdr c-state-cache)) 2911 (cdr c-state-cache))
2912 (< (point) here)) 2912 (< (point) here))
2913 (cond 2913 (cond
@@ -4610,7 +4610,7 @@ comment at the start of cc-engine.el for more info."
4610 s ; state 4610 s ; state
4611 'syntax-table))) ; stop-comment 4611 'syntax-table))) ; stop-comment
4612 (setq pos (point))) 4612 (setq pos (point)))
4613 4613
4614 ;; Now try and find enough non-literal characters recorded on the stack. 4614 ;; Now try and find enough non-literal characters recorded on the stack.
4615 ;; Go back one recorded literal each time round this loop. 4615 ;; Go back one recorded literal each time round this loop.
4616 (while (and (< count how-far-back) 4616 (while (and (< count how-far-back)
@@ -8516,8 +8516,8 @@ comment at the start of cc-engine.el for more info."
8516 )) 8516 ))
8517 8517
8518(defun c-looking-at-special-brace-list (&optional lim) 8518(defun c-looking-at-special-brace-list (&optional lim)
8519 ;; If we're looking at the start of a pike-style list, ie `({ })', 8519 ;; If we're looking at the start of a pike-style list, i.e., `({ })',
8520 ;; `([ ])', `(< >)' etc, a cons of a cons of its starting and ending 8520 ;; `([ ])', `(< >)', etc., a cons of a cons of its starting and ending
8521 ;; positions and its entry in c-special-brace-lists is returned, nil 8521 ;; positions and its entry in c-special-brace-lists is returned, nil
8522 ;; otherwise. The ending position is nil if the list is still open. 8522 ;; otherwise. The ending position is nil if the list is still open.
8523 ;; LIM is the limit for forward search. The point may either be at 8523 ;; LIM is the limit for forward search. The point may either be at
@@ -8762,7 +8762,7 @@ comment at the start of cc-engine.el for more info."
8762 (c-simple-skip-symbol-backward) 8762 (c-simple-skip-symbol-backward)
8763 (looking-at c-macro-with-semi-re) 8763 (looking-at c-macro-with-semi-re)
8764 (goto-char pos) 8764 (goto-char pos)
8765 (not (c-in-literal)))))) ; The most expensive check last. 8765 (not (c-in-literal)))))) ; The most expensive check last.
8766 8766
8767(defun c-macro-vsemi-status-unknown-p () t) ; See cc-defs.el. 8767(defun c-macro-vsemi-status-unknown-p () t) ; See cc-defs.el.
8768 8768
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 0d5549e4441..ba9c42e4c89 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1,4 +1,4 @@
1;;; cc-langs.el --- language specific settings for CC Mode 1;;; cc-langs.el --- language specific settings for CC Mode -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1985, 1987, 1992-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1985, 1987, 1992-2013 Free Software Foundation, Inc.
4 4
@@ -2907,7 +2907,7 @@ is in effect or not."
2907 2907
2908(c-lang-defconst c-special-brace-lists 2908(c-lang-defconst c-special-brace-lists
2909"List of open- and close-chars that makes up a pike-style brace list, 2909"List of open- and close-chars that makes up a pike-style brace list,
2910i.e. for a ([ ]) list there should be a cons (?\\[ . ?\\]) in this 2910i.e. for a ([ ]) list there should be a cons (?\\[ . ?\\]) in this
2911list." 2911list."
2912 t nil 2912 t nil
2913 pike '((?{ . ?}) (?\[ . ?\]) (?< . ?>))) 2913 pike '((?{ . ?}) (?\[ . ?\]) (?< . ?>)))
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index fbd1ded35a0..fc753bf7264 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -1,4 +1,4 @@
1;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks 1;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1994-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1994-2013 Free Software Foundation, Inc.
4 4
@@ -207,7 +207,7 @@
207;; Dean Andrews, Alf-Ivar Holm, Holger Bauer, Christoph Conrad, Dave Love, 207;; Dean Andrews, Alf-Ivar Holm, Holger Bauer, Christoph Conrad, Dave Love,
208;; Dirk Herrmann, Gael Marziou, Jan Djarv, Guillaume Leray, Moody Ahmad, 208;; Dirk Herrmann, Gael Marziou, Jan Djarv, Guillaume Leray, Moody Ahmad,
209;; Preston F. Crow, Lars Lindberg, Reto Zimmermann, Keith Sheffield, 209;; Preston F. Crow, Lars Lindberg, Reto Zimmermann, Keith Sheffield,
210;; Chew Meng Kuan, Tony Lam, Pete Ware, François Pinard, Stefan Monnier, 210;; Chew Meng Kuan, Tony Lam, Pete Ware, François Pinard, Stefan Monnier,
211;; Joseph Eydelnant, Michael Ernst, Peter Heslin 211;; Joseph Eydelnant, Michael Ernst, Peter Heslin
212;; 212;;
213;; Special thanks go to Dan Nicolaescu, who reimplemented hideshow using 213;; Special thanks go to Dan Nicolaescu, who reimplemented hideshow using
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 460dcd69447..85e4172c8fe 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1,9 +1,9 @@
1;;; prolog.el --- major mode for editing and running Prolog (and Mercury) code 1;;; prolog.el --- major mode for Prolog (and Mercury) -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 1986-1987, 1997-1999, 2002-2003, 2011-2013 Free 3;; Copyright (C) 1986-1987, 1997-1999, 2002-2003, 2011-2013 Free
4;; Software Foundation, Inc. 4;; Software Foundation, Inc.
5 5
6;; Authors: Emil Åström <emil_astrom(at)hotmail(dot)com> 6;; Authors: Emil Ã…ström <emil_astrom(at)hotmail(dot)com>
7;; Milan Zamazal <pdm(at)freesoft(dot)cz> 7;; Milan Zamazal <pdm(at)freesoft(dot)cz>
8;; Stefan Bruda <stefan(at)bruda(dot)ca> 8;; Stefan Bruda <stefan(at)bruda(dot)ca>
9;; * See below for more details 9;; * See below for more details
@@ -31,7 +31,7 @@
31;; Original author: Masanobu UMEDA <umerin(at)mse(dot)kyutech(dot)ac(dot)jp> 31;; Original author: Masanobu UMEDA <umerin(at)mse(dot)kyutech(dot)ac(dot)jp>
32;; Parts of this file was taken from a modified version of the original 32;; Parts of this file was taken from a modified version of the original
33;; by Johan Andersson, Peter Olin, Mats Carlsson, Johan Bevemyr, Stefan 33;; by Johan Andersson, Peter Olin, Mats Carlsson, Johan Bevemyr, Stefan
34;; Andersson, and Per Danielsson (all SICS people), and Henrik Båkman 34;; Andersson, and Per Danielsson (all SICS people), and Henrik BÃ¥kman
35;; at Uppsala University, Sweden. 35;; at Uppsala University, Sweden.
36;; 36;;
37;; Some ideas and also a few lines of code have been borrowed (not stolen ;-) 37;; Some ideas and also a few lines of code have been borrowed (not stolen ;-)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index da30edf272b..8f1954402e5 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1842,7 +1842,7 @@ May return nil if the line should not be treated as continued."
1842;; (defconst sh-smie-csh-grammar 1842;; (defconst sh-smie-csh-grammar
1843;; (smie-prec2->grammar 1843;; (smie-prec2->grammar
1844;; (smie-bnf->prec2 1844;; (smie-bnf->prec2
1845;; '((exp) ;A constant, or a $var, or a sequence of them… 1845;; '((exp) ;A constant, or a $var, or a sequence of them...
1846;; (elseifcmd (cmd) 1846;; (elseifcmd (cmd)
1847;; (cmd "else" "else-if" exp "then" elseifcmd)) 1847;; (cmd "else" "else-if" exp "then" elseifcmd))
1848;; (cmd ("switch" branches "endsw") 1848;; (cmd ("switch" branches "endsw")
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 08c4ba51905..009bb11fc10 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -137,8 +137,8 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
137 (format "Invalid character value: %S" value)) 137 (format "Invalid character value: %S" value))
138 widget)))) 138 widget))))
139 139
140(defcustom ruler-mode-fill-column-char (if (char-displayable-p ?¶) 140(defcustom ruler-mode-fill-column-char (if (char-displayable-p ?¶)
141 ?\¶ 141 ?\Â
142 ?\|) 142 ?\|)
143 "Character used at the `fill-column' location." 143 "Character used at the `fill-column' location."
144 :group 'ruler-mode 144 :group 'ruler-mode
@@ -163,8 +163,8 @@ or remove a tab stop. \\[ruler-mode-toggle-show-tab-stops] or
163 (integer :tag "Integer char value" 163 (integer :tag "Integer char value"
164 :validate ruler-mode-character-validate))) 164 :validate ruler-mode-character-validate)))
165 165
166(defcustom ruler-mode-current-column-char (if (char-displayable-p ?¦) 166(defcustom ruler-mode-current-column-char (if (char-displayable-p ?¦)
167 ?\¦ 167 ?\¦
168 ?\@) 168 ?\@)
169 "Character used at the `current-column' location." 169 "Character used at the `current-column' location."
170 :group 'ruler-mode 170 :group 'ruler-mode
@@ -774,7 +774,7 @@ Optional argument PROPS specifies other text properties to apply."
774(provide 'ruler-mode) 774(provide 'ruler-mode)
775 775
776;; Local Variables: 776;; Local Variables:
777;; coding: iso-latin-1 777;; coding: utf-8
778;; End: 778;; End:
779 779
780;;; ruler-mode.el ends here 780;;; ruler-mode.el ends here
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 93ff179229b..67f2d96d003 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -1,4 +1,4 @@
1;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files 1;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files -*- coding: utf-8 -*-
2 2
3;; Copyright (C) 2004-2013 Free Software Foundation, Inc. 3;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
4 4
@@ -23,7 +23,7 @@
23;;; Commentary: 23;;; Commentary:
24;; 24;;
25;; This mode is designed to edit many similar varieties of Conf/Ini files and 25;; This mode is designed to edit many similar varieties of Conf/Ini files and
26;; Java properties. It started out from Aurélien Tisné's ini-mode. 26;; Java properties. It started out from Aurélien Tisné's ini-mode.
27;; `conf-space-keywords' were inspired by Robert Fitzgerald's any-ini-mode. 27;; `conf-space-keywords' were inspired by Robert Fitzgerald's any-ini-mode.
28 28
29 29
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index 331f220f95b..610227af794 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -1,8 +1,8 @@
1;;; po.el --- basic support of PO translation files -*- coding: latin-1; -*- 1;;; po.el --- basic support of PO translation files -*- coding: utf-8; -*-
2 2
3;; Copyright (C) 1995-1998, 2000-2013 Free Software Foundation, Inc. 3;; Copyright (C) 1995-1998, 2000-2013 Free Software Foundation, Inc.
4 4
5;; Authors: François Pinard <pinard@iro.umontreal.ca>, 5;; Authors: François Pinard <pinard@iro.umontreal.ca>,
6;; Greg McGary <gkm@magilla.cichlid.com>, 6;; Greg McGary <gkm@magilla.cichlid.com>,
7;; Bruno Haible <bruno@clisp.org>. 7;; Bruno Haible <bruno@clisp.org>.
8;; Keywords: i18n, files 8;; Keywords: i18n, files
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index 3ba19bb9f40..f25fa87d0ec 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -40,7 +40,7 @@
40;; The default variable settings are suited for Czech, so do not try to 40;; The default variable settings are suited for Czech, so do not try to
41;; understand them if you are not familiar with Czech grammar and spelling. 41;; understand them if you are not familiar with Czech grammar and spelling.
42;; 42;;
43;; The algorithm was inspired by Petr Ol¹ák's program `vlna'. Abilities of 43;; The algorithm was inspired by Petr Olšák's program `vlna'. Abilities of
44;; `tildify.el' are a little limited; if you have improvement suggestions, let 44;; `tildify.el' are a little limited; if you have improvement suggestions, let
45;; me know. 45;; me know.
46 46
@@ -349,7 +349,7 @@ further questions)."
349 349
350 350
351;; Local variables: 351;; Local variables:
352;; coding: iso-latin-2 352;; coding: utf-8
353;; End: 353;; End:
354 354
355;;; tildify.el ends here 355;;; tildify.el ends here
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 59a09d6d5a0..47cd99f45ac 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -3,7 +3,7 @@
3;; Copyright (C) 2004-2013 Free Software Foundation, Inc. 3;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
4 4
5;; Filename: wdired.el 5;; Filename: wdired.el
6;; Author: Juan León Lahoz García <juanleon1@gmail.com> 6;; Author: Juan León Lahoz García <juanleon1@gmail.com>
7;; Version: 2.0 7;; Version: 2.0
8;; Keywords: dired, environment, files, renaming 8;; Keywords: dired, environment, files, renaming
9 9
@@ -851,7 +851,7 @@ Like original function but it skips read-only words."
851(provide 'wdired) 851(provide 'wdired)
852 852
853;; Local Variables: 853;; Local Variables:
854;; coding: latin-1 854;; coding: utf-8
855;; byte-compile-dynamic: t 855;; byte-compile-dynamic: t
856;; End: 856;; End:
857 857