Mercurial > hg > xemacs-beta

changeset 4310:a6d7e031a10b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix two Tailor glitches. For some reason, Tailor didn't copy these changes from CVS to Mercurial. Do so manually, really synching us with the latest from CVS.
author Mike Sperber <sperber@deinprogramm.de>
date Thu, 06 Dec 2007 20:10:16 +0100
parents 3fbaef93f665
children ee41a739fba3
files lisp/menubar.el lisp/mule/european.el
diffstat 2 files changed, 6 insertions(+), 446 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/menubar.el	Wed Dec 05 22:51:09 2007 +0000
+++ b/lisp/menubar.el	Thu Dec 06 20:10:16 2007 +0100
@@ -210,7 +210,7 @@
 				      (car item-path-list)))))
 	(cons result parent)))))
 
-(defun add-menu-item-1 (menu-path new-item before in-menu)
+(defun add-menu-item-1 (leaf-p menu-path new-item before in-menu)
   ;; This code looks like it could be cleaned up some more
   ;; Do we really need 6 calls to find-menu-item?
   (let* ((item-name
@@ -283,20 +283,20 @@
     (set-menubar-dirty-flag)
     new-item))
 
-(defun add-menu-button (menu-path menu-item &optional before in-menu)
+(defun add-menu-button (menu-path menu-leaf &optional before in-menu)
   "Add a menu item to some menu, creating the menu first if necessary.
 If the named item exists already, it is changed.
 MENU-PATH identifies the menu under which the new menu item should be inserted.
  It is a list of strings; for example, (\"File\") names the top-level \"File\"
  menu.  (\"File\" \"Foo\") names a hypothetical submenu of \"File\".
-MENU-ITEM is a menu or menu item.  See the documentation of `current-menubar'.
+MENU-LEAF is a menubar leaf node.  See the documentation of `current-menubar'.
 BEFORE, if provided, is the name of a menu item before which this item should
  be added, if this item is not on the menu already.  If the item is already
  present, it will not be moved.
 IN-MENU, if provided, means use that instead of `current-menubar' as the
  menu to change."
   ;; Note easymenu.el uses the fact that menu-leaf can be a submenu.
-  (add-menu-item-1 menu-path menu-item before in-menu))
+  (add-menu-item-1 t menu-path menu-leaf before in-menu))
 
 ;; I actually liked the old name better, but the interface has changed too
 ;; drastically to keep it. --Stig
@@ -315,8 +315,7 @@
 IN-MENU, if provided, means use that instead of `current-menubar' as the
  menu to change."
   (check-menu-syntax submenu nil)
-  (add-menu-item-1 menu-path submenu before in-menu))
-
+  (add-menu-item-1 nil menu-path submenu before in-menu))
 ;; purespace is no more, so this function is unnecessary
 ;(defun purecopy-menubar (x)
 ;  ;; this calls purecopy on the strings, and the contents of the vectors,
@@ -569,6 +568,7 @@
 accelerator specs -- this works even if the specs have already been added."
   (menu-split-long-menu (menu-sort-menu menu)))
 
+;;;###autoload
 (defun menu-split-long-menu (menu)
   "Split MENU according to `menu-max-items' and add accelerator specs.
 If MENU already has accelerator specs, they will be removed and new ones
--- a/lisp/mule/european.el	Wed Dec 05 22:51:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,440 +0,0 @@
-;;; european.el --- European languages -*- coding: iso-2022-7bit; -*-
-
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
-;; Copyright (C) 1997 MORIOKA Tomohiko
-;; Copyright (C) 2001 Ben Wing.
-;; Copyright (C) 2002, 2005, 2006 Free Software Foundation
-
-;; Keywords: multilingual, European
-
-;; This file is part of XEmacs.
-
-;; XEmacs is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; XEmacs is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
-
-;;; Commentary:
-
-;; For Roman-alphabet-using Europeans, eight coded character sets,
-;; ISO8859-1,2,3,4,9,14,15,16 are supported.
-
-
-
-;; Latin-1's case is dealt with in iso8859-1.el, which see. Its syntax is
-;; initialised in syntax.c:complex_vars_of_syntax.
-
-
-;; Latin-2 (ISO-8859-2). Central Europe; Czech, Slovak, Hungarian, Polish,
-;; Croatian, other languages.
-;;
-;; (Yes, it really is Central European. German written in Latin 2 and using
-;; only Umlaute and the sharp S in its non-ASCII repertoire is bit-for-bit
-;; identical with the same text in Latin-1.)
-
-(make-coding-system
- 'iso-8859-2 'iso2022 "ISO-8859-2 (Latin-2)"
- '(charset-g0 ascii
-   charset-g1 latin-iso8859-2
-   charset-g2 t
-   charset-g3 t
-   mnemonic "MIME/Ltn-2"))
-
-;; The default character syntax is now word. Pay attention to the
-;; exceptions in ISO-8859-2, copying them from ISO-8859-1. 
-(loop
-  for (latin-2 latin-1) 
-  in '((#xA0 #xA0)  ;; NO BREAK SPACE
-       (#xA2 #xB4)  ;; BREVE, ACUTE ACCENT
-       (#xA4 #xA4)  ;; CURRENCY SIGN
-       (#xA7 #xA7)  ;; SECTION SIGN
-       (#xA8 #xA8)  ;; DIAERESIS
-       (#xAD #xAD)  ;; SOFT HYPHEN
-       (#xB0 #xB0)  ;; DEGREE SIGN
-       (#xB2 #xB4)  ;; OGONEK, ACUTE ACCENT
-       (#xB4 #xB4)  ;; ACUTE ACCENT
-       (#xB7 #xB4)  ;; CARON, ACUTE ACCENT
-       (#xB8 #xB8)  ;; CEDILLA
-       (#xBD #xB4)  ;; DOUBLE ACUTE ACCENT, ACUTE ACCENT
-       (#xD7 #xD7)  ;; MULTIPLICATION SIGN
-       (#xF7 #xF7)  ;; DIVISION SIGN
-       (#xFF #xB4)) ;; DOT ABOVE, ACUTE ACCENT
-  with syntax-table = (standard-syntax-table)
-  do (modify-syntax-entry
-      (make-char 'latin-iso8859-2 latin-2)
-      (string (char-syntax (make-char 'latin-iso8859-1 latin-1)))
-      syntax-table))
-
-;; 
-;; Latin-3 (ISO-8859-3). Esperanto, Maltese and Turkish. Obsolescent.
-
-(make-coding-system
- 'iso-8859-3 'iso2022 "ISO-8859-3 (Latin-3)"
- '(charset-g0 ascii
-   charset-g1 latin-iso8859-3
-   charset-g2 t
-   charset-g3 t
-   mnemonic "MIME/Ltn-3"))
-
-;; Initialise the non-word syntax codes in ISO-8859-3, copying them from
-;; ISO-8859-1.
-(loop
-  for (latin-3 latin-1) 
-  in '((#xA0 #xA0)  ;; NO BREAK SPACE
-       (#xA2 #xB4)  ;; BREVE, ACUTE ACCENT
-       (#xA3 #xA3)  ;; POUND SIGN
-       (#xA4 #xA4)  ;; CURRENCY SIGN
-       (#xA7 #xA7)  ;; SECTION SIGN
-       (#xA8 #xA8)  ;; DIAERESIS
-       (#xAD #xAD)  ;; SOFT HYPHEN
-       (#xB0 #xB0)  ;; DEGREE SIGN
-       (#xB2 #xB2)  ;; SUPERSCRIPT TWO
-       (#xB3 #xB3)  ;; SUPERSCRIPT THREE
-       (#xB4 #xB4)  ;; ACUTE ACCENT
-       (#xB5 #xB5)  ;; MICRO SIGN
-       (#xB7 #xB7)  ;; MIDDLE DOT
-       (#xB8 #xB8)  ;; CEDILLA
-       (#xBD #xBD)  ;; VULGAR FRACTION ONE HALF
-       (#xD7 #xD7)  ;; MULTIPLICATION SIGN
-       (#xF7 #xF7)  ;; DIVISION SIGN
-       (#xFF #xB4)) ;; DOT ABOVE, ACUTE ACCENT
-  with syntax-table = (standard-syntax-table)
-  do (modify-syntax-entry
-      (make-char 'latin-iso8859-3 latin-3)
-      (string (char-syntax (make-char 'latin-iso8859-1 latin-1)))
-      syntax-table))
-
-;; Latin-4 (ISO-8859-4)
-
-;; Estonian, Latvian, Lithuanian, Greenlandic, and Sami. Obsolescent.
-
-(make-coding-system
- 'iso-8859-4 'iso2022 "ISO-8859-4 (Latin-4)"
- '(charset-g0 ascii
-   charset-g1 latin-iso8859-4
-   charset-g2 t
-   charset-g3 t
-   mnemonic "MIME/Ltn-4"))
-
-;; The default character syntax is now word. Pay attention to the
-;; exceptions in ISO-8859-4, copying them from ISO-8859-1. 
-(loop
-  for (latin-4 latin-1) 
-  in '((#xA0 #xA0)  ;; NO BREAK SPACE
-       (#xA4 #xA4)  ;; CURRENCY SIGN
-       (#xA7 #xA7)  ;; SECTION SIGN
-       (#xA8 #xA8)  ;; DIAERESIS
-       (#xAD #xAD)  ;; SOFT HYPHEN
-       (#xB0 #xB0)  ;; DEGREE SIGN
-       (#xB2 #xB4)  ;; OGONEK, ACUTE ACCENT
-       (#xB4 #xB4)  ;; ACUTE ACCENT
-       (#xB7 #xB4)  ;; CARON, ACUTE ACCENT
-       (#xB8 #xB8)  ;; CEDILLA
-       (#xD7 #xD7)  ;; MULTIPLICATION SIGN
-       (#xF7 #xF7)  ;; DIVISION SIGN
-       (#xFF #xB4)) ;; DOT ABOVE, ACUTE ACCENT
-  with syntax-table = (standard-syntax-table)
-  do (modify-syntax-entry
-      (make-char 'latin-iso8859-4 latin-4)
-      (string (char-syntax (make-char 'latin-iso8859-1 latin-1)))
-      syntax-table))
-
-
-;; Latin-8 (ISO 8859-14) Celtic.
-
-;; Never widely used. Current-orthography Gaelic, both Irish and Scots, is
-;; easily written with Latin-1. Wikipedia says the same about Welsh.
-
-(make-charset 'latin-iso8859-14 
-	      "Right-Hand Part of Latin Alphabet 8 (ISO/IEC 8859-14)"
-	      '(dimension 1
-		registries ["ISO8859-14"]
-		chars 96
-		columns 1
-		direction l2r
-		final ?_
-		graphic 1
-		short-name "RHP of Latin-8"
-		long-name "RHP of Latin-8 (ISO 8859-14)"))
-
-;; 
-;; Character syntax defaults to word. The exceptions here shared with Latin-1.
-(dolist (code '(#xa0	;; NO BREAK SPACE
-		#xa3	;; POUND SIGN
-		#xa7	;; SECTION SIGN
-		#xa9	;; COPYRIGHT
-		#xad	;; SOFT HYPHEN
-		#xae	;; REGISTERED
-		#xb6))	;; PILCROW SIGN
-  (modify-syntax-entry (make-char 'latin-iso8859-14 code)
-                       (string (char-syntax (make-char 'latin-iso8859-1 code)))
-                       (standard-syntax-table)))
-
-
-;; The syntax table code for ISO 8859-15 and ISO 8859-16 requires that the
-;; guillemets not have parenthesis syntax, which they used to have in the
-;; past. See syntax.c:complex_vars_of_syntax.
-
-(assert (not (memq (char-syntax (make-char 'latin-iso8859-1 #xAB)) '(?\( ?\))))
-        t "This code assumes \xAB does not have parenthesis syntax.  ")
-
-(assert (not (memq (char-syntax (make-char 'latin-iso8859-1 #xBB)) '(?\( ?\))))
-        t "This code assumes \xBB does not have parenthesis syntax.  ")
-
-
-;; Latin-9 (ISO-8859-15)
-;;
-;; Latin-1 plus Euro, plus a few accented characters for the sake of correct
-;; Finnish and French orthography. Only ever widely used on Unix. 
-;; 
-;; Based on Latin-1 and differences therefrom.
-;; 
-;; First, initialise the syntax from the corresponding Latin-1 characters. 
-(loop 
-  for c from #xa0 to #xff
-  with syntax-table = (standard-syntax-table)
-  do (modify-syntax-entry (make-char 'latin-iso8859-15 c)
-                          (string (char-syntax (make-char 'latin-iso8859-1 c)))
-                          syntax-table))
-
-;; Now, the exceptions. The Euro sign retains the syntax of CURRENCY SIGN.
-(loop
-  for c in '(?,b&(B ?,b((B ?,b4(B ?,b8(B ?,b<(B ?,b=(B ?,b>(B)
-  with syntax-table = (standard-syntax-table)
-  do (modify-syntax-entry c "w" syntax-table))
-
-(make-coding-system
- 'iso-8859-15 'iso2022
-  "ISO 4873 conforming 8-bit code (ASCII + Latin 9; aka Latin-1 with Euro)"
-  `(mnemonic "MIME/Ltn-9"		; bletch
-    eol-type nil
-    charset-g0 ascii
-    charset-g1 latin-iso8859-15
-    charset-g2 t
-    charset-g3 t))
-;; end of ISO 8859-15. 
-
-;;
-;; Latin-10 (ISO 8859-16).
-;;
-;; "South-Eastern European." Not, to my knowledge, ever widely used. 
-
-(make-charset 'latin-iso8859-16
-	      "Right-Hand Part of Latin Alphabet 10 (ISO/IEC 8859-16)"
-	      '(dimension 1
-		registries ["ISO8859-16"]
-		chars 96
-		columns 1
-		direction l2r
-		final ?f			; octet 06/06; cf ISO-IR 226
-		graphic 1
-		short-name "RHP of Latin-10"
-		long-name "RHP of Latin-10 (ISO 8859-16)"))
-
-;; Copy over the non-word syntax this charset has in common with Latin 1.
-(dolist (code '(#xa0	;; NO BREAK SPACE
-		#xa7	;; SECTION SIGN
-		#xa9	;; COPYRIGHT
-                #xab    ;; LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-		#xad	;; SOFT HYPHEN
-		#xb0	;; DEGREE
-		#xb1	;; PLUS-MINUS SIGN
-		#xb6	;; PILCROW SIGN
-		#xb7    ;; MIDDLE DOT 
-                #xbb))  ;; RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-  (modify-syntax-entry (make-char 'latin-iso8859-16 code)
-                       (string (char-syntax (make-char 'latin-iso8859-1 code)))
-                       (standard-syntax-table)))
-
-;; EURO SIGN. Take its syntax from the pound sign. 
-(modify-syntax-entry (make-char 'latin-iso8859-16 #xa4)
-                     (string (char-syntax (make-char 'latin-iso8859-1 #xa3)))
-                     (standard-syntax-table))
-
-;; Take DOUBLE LOW-9 QUOTATION MARK's syntax from that of LEFT-POINTING
-;; DOUBLE ANGLE QUOTATION MARK.
-(modify-syntax-entry (make-char 'latin-iso8859-16 #xa5) 
-                     (string (char-syntax (make-char 'latin-iso8859-1 #xab)))
-                     (standard-syntax-table))
-
-;; Take RIGHT DOUBLE QUOTATION MARK's syntax from that of RIGHT-POINTING
-;; DOUBLE ANGLE QUOTATION MARK.
-(modify-syntax-entry (make-char 'latin-iso8859-16 #xb5)
-                     (string (char-syntax (make-char 'latin-iso8859-1 #xbb)))
-                     (standard-syntax-table))
-
-;; Add a coding system for ISO 8859-16.
-(make-coding-system
- 'iso-8859-16 'iso2022 "MIME ISO-8859-16"
- '(charset-g0 ascii
-   charset-g1 latin-iso8859-16
-   charset-g2 t			; grrr
-   charset-g3 t			; grrr
-   mnemonic "MIME/Ltn-10"))
-
-;; end of ISO 8859-16. 
-
-
-(provide 'romanian)
-
-;; Czech support originally from czech.el
-;; Author: Milan Zamazal <pdm@zamazal.org>
-;; Maintainer (FSF): Pavel Jan,Am(Bk <Pavel@Janik.cz>
-;; Maintainer (for XEmacs): David Sauer <davids@penguin.cz>
-
-(provide 'czech)
-
-;; Slovak support originally from slovak.el
-;; Authors:    Tibor ,B)(Bimko <tibor.simko@fmph.uniba.sk>,
-;;             Milan Zamazal <pdm@fi.muni.cz>
-;; Maintainer: Milan Zamazal <pdm@fi.muni.cz>
-
-(provide 'slovenian)
-
-;; Latin-5 (ISO-8859-9)
-
-;; Turkish (more generally Turkic.) This is identical to Latin-1, with the
-;; exception that the Icelandic-specific letters have been replaced by
-;; Turkish-specific letters. As such, we can simply copy the Latin-1 syntax
-;; table. However, the case table isn't yet enabled--see latin.el.
-
-(loop
-  for i from #xA0 to #xFF
-  with syntax-table = (standard-syntax-table)
-  do (modify-syntax-entry
-      (make-char 'latin-iso8859-9 i)
-      (string (char-syntax (make-char 'latin-iso8859-1 i)))
-      syntax-table))
-
-(make-coding-system
- 'iso-8859-9 'iso2022 "ISO-8859-9 (Latin-5)"
- '(charset-g0 ascii
-   charset-g1 latin-iso8859-9
-   charset-g2 t
-   charset-g3 t
-   mnemonic "MIME/Ltn-5"))
-
-(loop 
-  for ((charset codesys default-input nice-charset-1 nice-charset-2
-                ;; supported-langs is a list if the doc string is replaced
-                ;; entirely
-                supported-langs) 
-       langenvs) in
-  '(((latin-iso8859-1 iso-8859-1 "latin-1-prefix" "Latin-1" "ISO-8859-1"
-" Danish, Dutch, English, Faeroese, Finnish, French, German, Icelandic,
- Irish, Italian, Norwegian, Portuguese, Spanish, and Swedish.")
-     (("Danish" "da")
-      ("Dutch" "nl" "TUTORIAL.nl")
-      ("Faeroese")
-      ("Finnish" "fi")
-      ("French" "fr" "TUTORIAL.fr" "Bonjour, ,Ag(Ba va?")
-      ("German" "de" "TUTORIAL.de" "\
-German (Deutsch Nord)	Guten Tag
-German (Deutsch S,A|(Bd)	Gr,A|_(B Gott"
-       "german-postfix")
-      ("Icelandic" "is")
-      ("Irish" "ga")
-      ("Italian" "it")
-      ("Norwegian" "no" "TUTORIAL.no")
-      ("Portuguese" "pt" nil "Bem-vindo! Tudo bem?")
-      ("Spanish" "es" "TUTORIAL.es" ",A!(BHola!")
-      ("Swedish" "sv" "TUTORIAL.se" "Hej!")))
-    ((latin-iso8859-15 iso-8859-15 "latin-1-prefix" ;; #### FIXME
-		       "Latin-9" "ISO-8859-15"
-		       ("\
-This language environment is a generic one for Latin-9 (ISO-8859-15)
-character set which supports the Euro sign and the following languages
-(they use the Latin-1 character set by default):
- Danish, Dutch, English, Faeroese, Finnish, French, German, Icelandic,
- Irish, Italian, Norwegian, Portuguese, Spanish, and Swedish.
-Each also has its own specific language environment."))
-     ())
-    ((latin-iso8859-2 iso-8859-2 "latin-2-prefix" "Latin-2" "ISO-8859-2"
-" Albanian, Czech, English, German, Hungarian, Polish, Romanian,
- Serbian, Croatian, Slovak, Slovene, Sorbian (upper and lower),
- and Swedish.") ;; " (fontification got screwed up, CVS-20061203)
-     (("Albanian" nil)
-      ("Croatian" ("hrvatski" "hr") "TUTORIAL.hr")
-      ("Czech" ("cs" "cz") "TUTORIAL.cs" "P,Bx(Bejeme v,Ba(Bm hezk,B}(B den!"
-       "latin-2-postfix")
-      ("Hungarian" ("hungarian" "hu"))
-      ("Polish" "po" "TUTORIAL.pl")
-      ("Romanian" "ro" "TUTORIAL.ro" "Bun,Bc(B ziua, bine a,B~(Bi venit!"
-       "latin-2-postfix")
-      ("Serbian" "sr")
-      ("Slovak" "sk" "TUTORIAL.sk" "Prajeme V,Ba(Bm pr,Bm(Bjemn,B}(B de,Br(B!"
-       ;; !!#### FSF "slovak"
-       "latin-2-postfix")
-      ("Slovenian" "sl" "TUTORIAL.sl" ",B.(Belimo vam uspe,B9(Ben dan!"
-       "latin-2-postfix")
-      ("Sorbian" nil)))
-    ((latin-iso8859-3 iso-8859-3 "latin-3-prefix" "Latin-3" "ISO-8859-3"
-" Afrikaans, Catalan, Dutch, English, Esperanto, French, Galician,
- German, Italian, Maltese, Spanish, and Turkish.")
-     (("Afrikaans" "af")
-      ("Catalan" ("catalan" "ca"))
-      ("Esperanto")
-      ("Galician")
-      ("Maltese")))
-    ((latin-iso8859-4 iso-8859-4 "latin-4-prefix" "Latin-4" "ISO-8859-4"
-" Danish, English, Estonian, Finnish, German, Greenlandic, Lappish,
- Latvian, Lithuanian, and Norwegian.")
-     (("Estonian" "et")
-      ("Greenlandic")
-      ("Lappish")
-      ("Latvian" "lv")
-      ("Lithuanian" "li")))
-    ((latin-iso8859-5 iso-8859-9 "latin-5-prefix" "Latin-5" "ISO-8859-9")
-     (("Turkish" "tr"))))
-  do
-  (set-language-info-alist
-   nice-charset-1
-   `((charset ascii ,charset)
-     (coding-system ,codesys)
-     (coding-priority ,codesys)
-     (documentation . ,(if (listp supported-langs) (car supported-langs)
-			 (format "\
-This language environment is a generic one for %s (%s)
-character set which supports the following languages (not all of them may
-use this character set by default):
-%s
-Each also has its own specific language environment."
-				 nice-charset-1 nice-charset-2
-				 supported-langs))))
-   '("European"))
-  (loop for (name locale tutorial sample-text input-method) in langenvs
-    do
-    (set-language-info-alist
-     name
-     `((charset ascii ,charset)
-       (coding-system ,codesys)
-       (coding-priority ,codesys)
-       ,@(if locale `((locale . ,locale)))
-       ,@(if tutorial `((tutorial . ,tutorial)))
-       ,@(if sample-text `((sample-text . ,sample-text)))
-       (input-method . ,(or input-method default-input))
-       (documentation . ,(format "\
-This language environment supports %s using the Latin-1 (ISO-8859-1)
-character set.  Languages supported by Latin-1 are Danish, Dutch, English,
-Faeroese, Finnish, French, German, Icelandic, Irish, Italian, Norwegian,
-Portuguese, Spanish, and Swedish.  The various language environments for
-these languages are similar to the Latin-1 environment, but typically have
-their own locale specified (for subprocesses and for selection of the
-correct language environment at startup), and may have their own tutorials
-and/or a different input method."
-			       name)))
-     '("European"))
-    ))
-
-;;; european.el ends here