Commits

Anonymous committed 9918c23

fix package compilation; update locale start files, profile docs

XEmacs.rules: text-modes is also needed due to dependency of texinfmt
on whitespace.
XEmacs.rules: Remove auto-autoloads if package-suppress forms have changed.
Touch auto-autoloads so it's always up-to-date; otherwise
problems ensue when no autoloads exist in a package.

start-files/ro/locale-start.el, start-files/ja/locale-start.el, start-files/fr/locale-start.el: Update start files to contain new versions for my new
splash-screen workspace.

ps-print/Makefile: text-modes depends on xemacs-base.

texinfo/Makefile: Depends on text-modes.
texinfmt.el: Require 'whitespace to fix compilation.

xemacs-base/Makefile: Conditionalize package-suppress forms on existence of
`package-suppress', not any particular version.
add-log.el: Require font-lock, since we make use of font-lock faces in
calls to set-face-parent upon loading, and faces are not
automatically autoloaded if we do it this way.

profile.el: Update header docs.

  • Participants
  • Parent commits a9157d0

Comments (0)

Files changed (4)

+2004-12-06  Ben Wing  <ben@xemacs.org>
+
+	* start-files/ro/locale-start.el:
+	* start-files/ro/locale-start.el (fboundp):
+	* start-files/ro/locale-start.el (startup-splash-frame-body): Removed.
+	* start-files/ro/locale-start.el (splash-frame-body): New.
+	* start-files/ro/locale-start.el (splash-screen-window-body): New.
+	* start-files/ro/locale-start.el (splash-screen-tty-body): New.
+	* start-files/ro/locale-start.el (command-line-do-help):
+	* start-files/ja/locale-start.el:
+	* start-files/ja/locale-start.el (fboundp):
+	* start-files/ja/locale-start.el (startup-splash-frame-body): Removed.
+	* start-files/ja/locale-start.el (splash-frame-body): New.
+	* start-files/ja/locale-start.el (splash-screen-window-body): New.
+	* start-files/ja/locale-start.el (splash-screen-tty-body): New.
+	* start-files/ja/locale-start.el (command-line-do-help):
+	* start-files/fr/locale-start.el:
+	* start-files/fr/locale-start.el (fboundp):
+	* start-files/fr/locale-start.el (splash-frame-body):
+	* start-files/fr/locale-start.el (splash-screen-window-body): New.
+	* start-files/fr/locale-start.el (splash-screen-tty-body): New.
+	Update start files to contain new versions for my new
+	splash-screen workspace.
+
 2003-10-31  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.21 released.

File start-files/fr/locale-start.el

 
 ;;; Code:
 
+(if (fboundp 'splash-frame-body)
+
+;; old way
+
 (defun splash-frame-body ()
   `[((face (blue bold underline)
 	   "\nDistribution, license de reproduction, garanties:\n\n")
 Copyright (C) 1990-1994 Lucid, Inc.
 Copyright (C) 1993-1997 Sun Microsystems, Inc. Tous droits r�serv�s.
 Copyright (C) 1994-1996 Board of Trustees, University of Illinois
-Copyright (C) 1995-1996 Ben Wing\n"))
+Copyright (C) 1995-2004 Ben Wing\n"))
 
     ((face (blue bold underline) "\nInformation, aide en ligne:\n\n")
      "XEmacs vient avec une documentation fournie...\n\n"
      ((key save-buffers-kill-emacs) ": sortir d'XEmacs\n"))
     ])
 
-(setq splash-frame-static-body
-      `(,(emacs-version) "\n\n"
-	(face italic
-	      "`C-' signifie la touche Contr�le,`M-' signifie la touche M�ta\n\n")))
+;; new way
+
+(defun splash-screen-window-body ()
+  `(
+     (face (blue bold underline)
+	   "#### Entries utiles dans le menu Aide:\n\n")
+     ,@(if (string-match "beta" emacs-version)
+	   `((face bold "Beta Info:")
+	     (face (red bold)
+		   "                      Ceci est une version exp�rimentale d'XEmacs.\n"))
+	 `( ""))
+     (face bold "XEmacs FAQ:")
+     "                     Lisez la FAQ d'XEmacs.\n"
+     (face bold "Info (Online Docs):")
+     "             Lisez la documentation en-ligne.\n"
+     (face bold "Tutorial:")
+     "                       Lisez le tutoriel d'XEmacs.\n"
+     (face bold "Samples->View Sample init.el:") ;; #### translation
+     "   Un fichier utile d'initialization.\n"
+     (face bold "About XEmacs:")
+     "                   � propos des d�veloppeurs d'XEmacs.\n"
+     "\n"
+     (face (bold blue) "Site web d'XEmacs:")
+     "                 http://www.xemacs.org/\n\n"
+     ,@(if (featurep 'sparcworks)
+	   `( "\
+Sun fournit un support pour le paquet d'int�gration Workshop/XEmacs seulement.
+Tous les autres paquets d'XEmacs sont fournis �TEL QUEL�.\n"
+	      ,@(let ((lang (or (getenv "LC_ALL") (getenv "LC_MESSAGES")
+				(getenv "LANG"))))
+		  (if (and
+		       (not (featurep 'mule)) ;; Already got mule?
+		       lang ;; Non-English locale?
+		       (not (string= lang "C"))
+		       (not (string-match "^en" lang))
+		       ;; Comes with Sun WorkShop
+		       (locate-file "xemacs-mule" exec-path))
+		      '( "\
+Cette version d'XEmacs a �t� compil�e avec le support Latin-1 seul.
+Pour manipuler d'autres langages, vous devez disposer d'une version
+multi-lingue (`Mule') d'XEmacs, soit en utilisant la commande `xemacs-mule',
+soit en positionnant la resource X `ESERVE*defaultXEmacsPath: xemacs-mule' en
+d�marrant XEmacs depuis le WorkShop de Sun.
+\n")))))
+     (face italic "\
+Copyright (C) 1985-1999 Free Software Foundation, Inc.
+Copyright (C) 1990-1994 Lucid, Inc.
+Copyright (C) 1993-1997 Sun Microsystems, Inc. Tous droits r�serv�s.
+Copyright (C) 1994-1996 Board of Trustees, University of Illinois.
+Copyright (C) 1995-2004 Ben Wing.\n")
+     ))
+
+(defun splash-screen-tty-body ()
+  `(
+    (face italic "[`C-' signifie la touche Contr�le,`M-' signifie la touche M�ta]\n\n")
+     ,@(if (string-match "beta" emacs-version)
+	   `((key describe-beta)
+	     ": " (face (red bold)
+			"Ceci est une version exp�rimentale d'XEmacs.\n"))
+	 `( "\n"))
+     ((key xemacs-local-faq)
+      ": Lisez la FAQ d'XEmacs. (Un F " (face underline "majuscule") " !)\n")
+     ((key info) ": Lisez la documentation en-ligne.\n")
+     ((key help-command)
+      ": De l'aide sur l'utilisation d'XEmacs.\n")
+     ((key help-with-tutorial)
+      ": Lisez le tutoriel d'XEmacs.\n")
+     ((key view-sample-init-el) ;; #### translation?
+      ": Regardez le fichier sample init.el.\n")
+     ((key about-xemacs) ": � propos des d�veloppeurs d'XEmacs.\n\n")
+     (face (bold blue) "Site web d'XEmacs: ") 
+     "http://www.xemacs.org/\n\n"
+     (face italic "\
+Copyright (C) 1985-1999 Free Software Foundation, Inc.
+Copyright (C) 1990-1994 Lucid, Inc.
+Copyright (C) 1993-1997 Sun Microsystems, Inc. Tous droits r�serv�s.
+Copyright (C) 1994-1996 Board of Trustees, University of Illinois.
+Copyright (C) 1995-2004 Ben Wing.")
+;      ((key find-file) ": visiter un fichier\n")
+;      ((key save-buffer) ": sauvegarder les modifiactions\n")
+;      ((key advertised-undo) ": annuler les modifications\n")
+;      ((key save-buffers-kill-emacs) ": sortir d'XEmacs\n")
+     ))
+)
 
 ;;; locale-start.el ends here

File start-files/ja/locale-start.el

 
 ;;; Code:
 
-(defun startup-splash-frame-body ()
+(if (fboundp 'splash-frame-body)
+
+;; old way
+
+(defun splash-frame-body ()
   `("\n" ,(emacs-version) "\n"
     (face bold-italic "\
 Copyright (C) 1985-1997 Free Software Foundation, Inc.
 Copyright (C) 1990-1994 Lucid, Inc.
 Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved.
 Copyright (C) 1994-1996 Board of Trustees, University of Illinois
-Copyright (C) 1995-1996 Ben Wing\n\n")
+Copyright (C) 1995-2004 Ben Wing\n\n")
     
     ,@(if (featurep 'sparcworks)
           `( "\
 $BIQHK$K?R$M$i$l$k<ALd$H$=$NEz$($O!"(BXEmacs $BLdEz=8$K$"$j$^$9!#(B\n"
     "$B%X%k%W%a%K%e!<$r;HMQ$9$k$+!"(B"(key xemacs-local-faq) " $B$H%?%$%W$7$F$/$@$5$$!#(B"))))
 
+;; new way
+
+(defun splash-screen-window-body ()
+  `(
+     (face (blue bold underline)
+	   "#### Entries utiles dans le menu Aide:\n\n")
+     ,@(if (string-match "beta" emacs-version)
+	   `((face bold "Beta Info:")
+	     (face (red bold)
+		   "                      Ceci est une version exp,Ai(Brimentale d'XEmacs.\n"))
+	 `( ""))
+     (face bold "XEmacs FAQ:")
+     "                     Lisez la FAQ d'XEmacs.\n"
+     (face bold "Info (Online Docs):")
+     "             $B$K$h$j!"(BInfo $B%b!<%I$KF~$j!"%*%s%i%$%s$N%I%-%e%a%s%H$r(B.\n"
+     (face bold "Tutorial:")
+     "                       Lisez le tutoriel d'XEmacs.\n"
+     (face bold "Samples->View Sample init.el:") ;; #### translation
+     "   Un fichier utile d'initialization.\n"
+     (face bold "About XEmacs:")
+     "                   ,A@(B propos des d,Ai(Bveloppeurs d'XEmacs.\n"
+     "\n"
+     (face (bold blue) "Site web d'XEmacs:")
+     "                 http://www.xemacs.org/\n\n"
+     ,@(if (featurep 'sparcworks)
+	   `( "\
+$B%5%s$O!"(BWorkShop/Emacs $BE}9g2=%Q%C%1!<%8$N$_$r%5%]!<%H$7$^$9!#(B
+$BB>$N(B XEmacs $B%Q%C%1!<%8$O$9$Y$F!"!V8=>u$N$^$^!W$G6!5k$5$l$^$9!#(B
+$B>\:Y(B ($B1QJ8(B) $B$O(B" (key describe-no-warranty) "$B$H%?%$%W$7$F!"(B
+1991 $BG/(B 6 $B7nHG(B GPL $B%P!<%8%g%s(B 2 $B$r$4Mw$/$@$5$$!#(B
+$BK\(B XEmacs $B$O4pK\%a%K%e!<$K8B$jF|K\8l2=$5$l$F$$$^$9!#AH$_9~$^$l$?(B
+$B%a!<%k(B (VM$B!"(BMH) $B$d%K%e!<%9$rFI$`$?$a$N%Q%C%1!<%8(B (Gnus) $BEy$O!"(B
+$BF|K\8l$r40`z$K$O=hM}$G$-$^$;$s$N$G!"$4;HMQ$K$J$k>l9g$O==J,$4Cm0U(B
+$B$/$@$5$$!#(B\n"))
+
+     (face italic "\
+Copyright (C) 1985-1999 Free Software Foundation, Inc.
+Copyright (C) 1990-1994 Lucid, Inc.
+Copyright (C) 1993-1997 Sun Microsystems, Inc. Tous droits r,Ai(Bserv,Ai(Bs.
+Copyright (C) 1994-1996 Board of Trustees, University of Illinois.
+Copyright (C) 1995-2004 Ben Wing.\n")
+     ))
+
+(defun splash-screen-tty-body ()
+  `(
+    (face italic "[`C-' signifie la touche Contr,At(Ble,`M-' signifie la touche M,Ai(Bta]\n\n")
+     ,@(if (string-match "beta" emacs-version)
+	   `((key describe-beta)
+	     ": " (face (red bold)
+			"Ceci est une version exp,Ai(Brimentale d'XEmacs.\n"))
+	 `( "\n"))
+     (face (bold red) ( "\
+$BIQHK$K?R$M$i$l$k<ALd$H$=$NEz$($O!"(BXEmacs $BLdEz=8$K$"$j$^$9!#(B\n"
+			"$B%X%k%W%a%K%e!<$r;HMQ$9$k$+!"(B"(key xemacs-local-faq) " $B$H%?%$%W$7$F$/$@$5$$!#(B"))
+     ((key info) " $B$K$h$j!"(BInfo $B%b!<%I$KF~$j!"%*%s%i%$%s$N%I%-%e%a%s%H$r(B\n")
+     ((key help-command)
+      ": De l'aide sur l'utilisation d'XEmacs.\n")
+     ((key help-with-tutorial)
+      " $B$G(B XEmacs $B$N;HMQJ}K!$N<B=,$r3+;O$G$-$^$9!#(B\n")
+     ((key view-sample-init-el) ;; #### translation?
+      ": Regardez le fichier sample init.el.\n")
+     ((key about-xemacs) ": ,A@(B propos des d,Ai(Bveloppeurs d'XEmacs.\n\n")
+     (face (bold blue) "Site web d'XEmacs: ") 
+     "http://www.xemacs.org/\n\n"
+     (face italic "\
+Copyright (C) 1985-1999 Free Software Foundation, Inc.
+Copyright (C) 1990-1994 Lucid, Inc.
+Copyright (C) 1993-1997 Sun Microsystems, Inc. Tous droits r,Ai(Bserv,Ai(Bs.
+Copyright (C) 1994-1996 Board of Trustees, University of Illinois.
+Copyright (C) 1995-2004 Ben Wing.")
+;      ((key find-file) ": visiter un fichier\n")
+;      ((key save-buffer) ": sauvegarder les modifiactions\n")
+;      ((key advertised-undo) ": annuler les modifications\n")
+;      ((key save-buffers-kill-emacs) ": sortir d'XEmacs\n")
+     ))
+)
 
 (defun command-line-do-help (arg)
   "Print the XEmacs usage message and exit."

File start-files/ro/locale-start.el

 
 ;;; Code:
 
-(defun startup-splash-frame-body ()
+(if (fboundp 'splash-frame-body)
+
+;; old way
+
+(defun splash-frame-body ()
   (set-buffer-file-coding-system 'iso-8859-2)
   `("\n" ,(emacs-version) "\n"
     ,@(if (string-match "beta" emacs-version)
 Copyright (C) 1990-1994 Lucid, Inc.
 Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved.
 Copyright (C) 1994-1996 Board of Trustees, University of Illinois
-Copyright (C) 1995-1996 Ben Wing\n\n")
+Copyright (C) 1995-2004 Ben Wing\n\n")
     
     ,@(if (featurep 'sparcworks)
           `( "\
 Pentru sugestii -B�i r�spunsuri la �ntreb�ri frecvente, citi�i FAQ-ul XEmacs-ului.-A
 \(Este -B�n meniul Help, dar pute�i tasta �i " (key xemacs-local-faq) " [F mare!].\)"))))-A
 
+;; new way
+
+(defun splash-screen-window-body ()
+  `(
+     (face (blue bold underline)
+	   "#### Entries utiles dans le menu Aide:\n\n")
+     ,@(if (string-match "beta" emacs-version)
+	   `((face bold "Beta Info:")
+	     (face (red bold)
+		   "                      Ceci est une version exp�rimentale d'XEmacs.\n"))
+	 `( ""))
+     (face bold "XEmacs FAQ:")
+     "                     Lisez la FAQ d'XEmacs.\n"
+     (face bold "Info (Online Docs):")
+     "             Lisez la documentation en-ligne.\n"
+     (face bold "Tutorial:")
+     "                       Lisez le tutoriel d'XEmacs.\n"
+     (face bold "Samples->View Sample init.el:") ;; #### translation
+     "   Un fichier utile d'initialization.\n"
+     (face bold "About XEmacs:")
+     "                   � propos des d�veloppeurs d'XEmacs.\n"
+     "\n"
+     (face (bold blue) "Site web d'XEmacs:")
+     "                 http://www.xemacs.org/\n\n"
+     ,@(if (featurep 'sparcworks)
+	   `( "\
+Sun fournit un support pour le paquet d'int�gration Workshop/XEmacs seulement.
+Tous les autres paquets d'XEmacs sont fournis �TEL QUEL�.\n"
+	      ,@(let ((lang (or (getenv "LC_ALL") (getenv "LC_MESSAGES")
+				(getenv "LANG"))))
+		  (if (and
+		       (not (featurep 'mule)) ;; Already got mule?
+		       lang ;; Non-English locale?
+		       (not (string= lang "C"))
+		       (not (string-match "^en" lang))
+		       ;; Comes with Sun WorkShop
+		       (locate-file "xemacs-mule" exec-path))
+		      '( "\
+Cette version d'XEmacs a �t� compil�e avec le support Latin-1 seul.
+Pour manipuler d'autres langages, vous devez disposer d'une version
+multi-lingue (`Mule') d'XEmacs, soit en utilisant la commande `xemacs-mule',
+soit en positionnant la resource X `ESERVE*defaultXEmacsPath: xemacs-mule' en
+d�marrant XEmacs depuis le WorkShop de Sun.
+\n")))))
+     (face italic "\
+Copyright (C) 1985-1999 Free Software Foundation, Inc.
+Copyright (C) 1990-1994 Lucid, Inc.
+Copyright (C) 1993-1997 Sun Microsystems, Inc. Tous droits r�serv�s.
+Copyright (C) 1994-1996 Board of Trustees, University of Illinois.
+Copyright (C) 1995-2004 Ben Wing.\n")
+     ))
+
+(defun splash-screen-tty-body ()
+  `(
+    (face italic "[`C-' signifie la touche Contr�le,`M-' signifie la touche M�ta]\n\n")
+     ,@(if (string-match "beta" emacs-version)
+	   `((key describe-beta)
+	     ": " (face (red bold)
+			"Ceci est une version exp�rimentale d'XEmacs.\n"))
+	 `( "\n"))
+     ((key xemacs-local-faq)
+      ": Lisez la FAQ d'XEmacs. (Un F " (face underline "majuscule") " !)\n")
+     ((key info) ": Lisez la documentation en-ligne.\n")
+     ((key help-command)
+      ": De l'aide sur l'utilisation d'XEmacs.\n")
+     ((key help-with-tutorial)
+      ": Lisez le tutoriel d'XEmacs.\n")
+     ((key view-sample-init-el) ;; #### translation?
+      ": Regardez le fichier sample init.el.\n")
+     ((key about-xemacs) ": � propos des d�veloppeurs d'XEmacs.\n\n")
+     (face (bold blue) "Site web d'XEmacs: ") 
+     "http://www.xemacs.org/\n\n"
+     (face italic "\
+Copyright (C) 1985-1999 Free Software Foundation, Inc.
+Copyright (C) 1990-1994 Lucid, Inc.
+Copyright (C) 1993-1997 Sun Microsystems, Inc. Tous droits r�serv�s.
+Copyright (C) 1994-1996 Board of Trustees, University of Illinois.
+Copyright (C) 1995-2004 Ben Wing.")
+;      ((key find-file) ": visiter un fichier\n")
+;      ((key save-buffer) ": sauvegarder les modifiactions\n")
+;      ((key advertised-undo) ": annuler les modifications\n")
+;      ((key save-buffers-kill-emacs) ": sortir d'XEmacs\n")
+     ))
+)
 
 (defun command-line-do-help (arg)
   "Print the XEmacs usage message and exit."