[PATCH (pkgs/locale)] Fix -help in Japanese UTF-8 setups
16 years, 11 months
Ville Skyttä
With 21.5.27, running "LANG=ja_JP.UTF-8 /usr/bin/xemacs -help" results in this
for me:
$ LANG=ja_JP.UTF-8 /usr/bin/xemacs -help
Loading /usr/share/xemacs/site-packages/lisp/site-start.d/rpmdev-init.el...
Loading leim-list...
xemacs exiting.
Cannot open load file: "un-define"
The attached patch crudely fixes it. Unless someone objects or comes up with
a better way to fix it, will apply in a couple of days.
2007-05-08 Ville Skyttä <scop(a)xemacs.org>
* start-files/ja/locale-start.el (command-line-do-help):
Don't try to load `un-define' with XEmacs >= 21.5.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC (pkgs/prog-modes)] rpm-spec-mode improvements, sync with recent rpm
16 years, 11 months
Ville Skyttä
APPROVE COMMIT
Committed a little while ago in smaller pieces.
2007-05-09 Ville Skyttä <scop(a)xemacs.org>
* rpm-spec-mode.el: Update FSF's address in comments.
(rpm-spec-mode-version): 0.12x.
(rpm-tags-list): Sync with rpm 4.4.9.
(rpm-section-regexp): Ditto.
(rpm-scripts): Ditto.
(rpm-change): `message' format string usage fix.
(rpm-change-n): Ditto.
(rpm-build-prepare): Ditto.
(rpm-list-check): Ditto.
(rpm-build-binary): Ditto.
(rpm-build-source): Ditto.
(rpm-build-all): Ditto.
(rpm-increase-release-tag): Ditto.
(rpm-increase-release-with-macros): Ditto.
(rpm-tags-regexp): New; regexp for matching valid tags.
(rpm-obsolete-tags-list): New; list of obsolete tags.
(rpm-obsolete-tags-regexp): New; regexp for matching obsolete tags.
(rpm-spec-obsolete-tag-face): New; face for obsolete tags.
(rpm-spec-font-lock-keywords): Use `rpm-tags-regexp',
`rpm-obsolete-tags-regexp' and `rpm-spec-obsolete-tag-face'.
(rpm-increase-release-tag): Permit whitespace between tag and colon.
(rpm-increase-release-with-macros): Ditto.
(rpm-spec-font-lock-keywords): Ditto.
(rpm-spec-font-lock-keywords): Treat %global like %define.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
Re: [Q] Non-Latin-1 escapes can lead to corrupted ELC code.
16 years, 11 months
Aidan Kehoe
Ar an seachtú lá de mí Bealtaine, scríobh Stephen J. Turnbull:
> QUERY
>
> Aidan Kehoe writes:
>
> > Without this patch, the following test file is compiled incorrectly:
> >
> > (defvar Pravda "\u05bf\u05e0\u05d0\u05d2\u05d4\u05d0")
>
> I VETO that, you Capitalist Lackey! That should be DEFCONST!!
Also on the grounds that I generated those codes using XEmacs character
values, not UCS, so it’s actually in Hebrew script, and promoting the
interests of rootless cosmopolitans! (Nonsensically, since I’m pretty sure
ֿנאגהא doesn’t mean anything.)
> Non-mandatory suggestion/question: How hard would it be for non-mule
> to recognize the new Unicode escapes and signal an `unimplemented'
> error? If that can be done correctly, it would be one small step to a
> non-Mule Unicode- enabled XEmacs.
Non-Mule currently recognises the new Unicode escapes. The thing is that the
Lisp printer doesn’t generated them; when strings are written to compiled
files, they’re written as literals.
> > + (let ((case-fold-search nil))
> > + (re-search-forward
> > + (concat "[^\000-\377]"
> > + #r"\\u[0-9a-fA-F]\{4,4\}\|\\U[0-9a-fA-F]\{8,8\}")
> > + nil t)))
>
> Don't you need an OR in the regexp?
Yeah.
I’ll write test cases for this before I commit it, to catch stupid things
like that. (I’ve currently another patch in the pipeline with tests to catch
stupid things like the Turkish language environment referring to a character
set that doesn’t exist, and the Latin-10 language environment referring to
an input method that doesn’t exist, but I think I need to eliminate the
second error from packages before I can make check correctly.)
> (concat "[^\000-\377]"
> #r"\|\\u[0-9a-fA-F]\{4,4\}\|\\U[0-9a-fA-F]\{8,8\}")
> ^
> HERE ---------------------+
>
> > + ;; Look for any non-Latin-1 literals or Unicode character
> > + ;; escapes. Also catches them in comments, which is actually
> > + ;; irrelevant to us, but implementing a more complex algorithm
> > + ;; is not worth the trade-off.
>
> Non-mandatory suggestion: Wouldn't
>
> (let ((case-fold-search nil)
> (mule-re (concat "[^\000-\377]"
> #r"\|\\u[0-9a-fA-F]\{4,4\}\|\\U[0-9a-fA-F]\{8,8\}")))
> (catch 'need-to-escape-quote
> (while (re-search-forward mule-re nil t)
> (skip-chars-backward ";" (point-at-bol))
(skip-chars-backward "^;" (point-at-bol)) ?
> (if (bolp)
> (throw 'need-to-escape-quote t))
> (forward-line 1))))
>
> do the trick for avoiding triggering on comments?
Yes, unless people use the #＠COUNT construct in source files, which we
don’t recommend.
> Since it's compile-time and essentially one-pass, performance is really
> not that big an issue. Whether this is a good idea is another question;
> I'm of two minds about that.
--
On the quay of the little Black Sea port, where the rescued pair came once
more into contact with civilization, Dobrinton was bitten by a dog which was
assumed to be mad, though it may only have been indiscriminating. (Saki)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC guided-tour] Cosmetic changes, including requested by Phil Sung
16 years, 11 months
Stephen J. Turnbull
AC guided-tour
A few minor changes, mostly cosmetic. I've added a few "open"
utilities, as suggested by Jason Spiro and Ville Skyttä.
cvs diff
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/guided-tour/ChangeLog,v
retrieving revision 1.1
diff -u -r1.1 ChangeLog
--- ChangeLog 5 May 2007 15:19:43 -0000 1.1
+++ ChangeLog 5 May 2007 15:31:11 -0000
＠＠ -0,0 +1,21 ＠＠
+2007-05-05 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * guided-tour.el: Make pointer to permissions notice more accurate.
+ (guided-tour):
+ (guided-tour-submenu):
+ (guided-tour-insinuate-menubar):
+ Bow to Phil's modesty.
+ (guided-tour-about):
+ Add pointers to Phil's page, GNU's mirror, licensing, and plans to FAQ.
+
+2007-05-04 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * guided-tour.el (guided-tour-open-utilities): New. List of
+ generic open utilities. Add `xdg-open', `see', and `gnome-open'.
+ Suggested by Jason Spiro and Ville Skytt%G~%＠n XEmacs Beta.
+ <c241693f0705031325g5f10c8dfl689dd5ed78233710(a)mail.gmail.com>
+ <200705040928.41802.scop(a)xemacs.org>
+ (guided-tour-odp-viewer):
+ (guided-tour-pdf-viewer):
+ Use it.
+
Index: guided-tour.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/guided-tour/guided-tour.el,v
retrieving revision 1.1
diff -u -r1.1 guided-tour.el
--- guided-tour.el 5 May 2007 15:19:47 -0000 1.1
+++ guided-tour.el 5 May 2007 15:31:11 -0000
＠＠ -7,10 +7,10 ＠＠
;; Created: 2007-05-02
;; Keywords: doc
-;; The permissions notice is contained in the function
-;; `guided-tour-about' at the end of this file. Under the terms
-;; granted, you may modify that function, but the appropriate
-;; permissions notice must remain in this file somewhere.
+;; The permissions notice is contained in the function `guided-tour-about'
+;; at the end of this file. Under the terms granted, you may modify that
+;; function, but the appropriate permissions notice must remain somewhere in
+;; any file derived from this one.
;;; Synched up with: Not in FSF.
＠＠ -23,23 +23,36 ＠＠
;; Variables
-(defgroup guided-tour nil "Phil Sung's Emacs Guided Tour")
+(defgroup guided-tour nil "The Guided Tour of Emacs")
+
+;; #### this belongs somewhere more generic
+;; #### it would be nice to be able to filter it for platform
+;; #### The docstrings don't appear in the Value Menu. Tried the menu-choice
+;; widget and the :tag and :menu-tag keywords in various combinations, no joy.
+(defcustom guided-tour-open-utilities
+ '((const "open" :doc "Useful on Mac OS X")
+ (const "xdg-open" :doc "Freedesktop `open' utility.")
+ (const "see" :doc "Open source `open' utility")
+ (const "gnome-open" :doc "GNOME `open' utility - some report it doesn't work"))
+ "List of generic \"open document\" command-line utilities.
+Each utility should be able to determine the right application to use to open
+an arbitrary file passed to it on the command line.")
(defcustom guided-tour-odp-viewer "ooimpress"
"Path to program able to view Open Document Format presentations.
Program is invoked in a shell, so PATH is searched."
-:type '(choice string
- (const "ooimpress")
- (const "open" :doc "Useful on Mac OS X"))
+:type (append '(choice string
+ (const "ooimpress"))
+ guided-tour-open-utilities)
:group 'guided-tour)
(defcustom guided-tour-pdf-viewer "xpdf"
"Path to program able to view Portable Document Format documents.
Program is invoked in a shell, so PATH is searched."
-:type '(choice string
- (const "xpdf")
- (const "gv")
- (const "open" :doc "Useful on Mac OS X"))
+:type (append '(choice string
+ (const "xpdf")
+ (const "gv"))
+ guided-tour-open-utilities)
:group 'guided-tour)
(defconst guided-tour-submenu
＠＠ -51,7 +64,7 ＠＠
["Guided Tour, Part %_2 (PDF)" guided-tour-pdf-2]
["Guided Tour, Part %_3 (PDF)" guided-tour-pdf-3]
["About COPYING the Tour" guided-tour-about])
- "The submenu for Phil Sung's \"Guided Tour of Emacs\".")
+ "The submenu for the \"Guided Tour of Emacs\".")
(defvar guided-tour-insinuate-menubar nil
"If non-nil, inhibits insinuation of the menubar.
＠＠ -81,7 +94,7 ＠＠
;;;###autoload
(defun guided-tour-insinuate-menubar ()
- "Add Phil Sung's Guided Tour of Emacs to the default menubar."
+ "Add the Guided Tour of Emacs to the default menubar."
(unless guided-tour-insinuate-menubar
(setq guided-tour-insinuate-menubar t)
(let* ((help (guided-tour-find-menubar-help-menu)))
＠＠ -174,16 +187,33 ＠＠
FAQ
-Q1. I select a tour from the menu, but nothing happens!
-A1. You probably need to configure a viewer. C-h v guided-tour-pdf-viewer RET
- or C-h v guided-tour-odp-viewer RET.
-"
+Section 1: Problems
-;; #### Find web, C-h, and maybe file locations for licenses, then add above.
-;; 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.
+Q1.1 I select a tour from the menu, but nothing happens!
+A1.1 You probably need to configure a viewer. C-h v guided-tour-pdf-viewer RET
+ or C-h v guided-tour-odp-viewer RET.
+
+Section 2: Further Info.
+
+Q2.1 Where can I find the licenses?
+A2.1 The GPL is included with XEmacs and Emacs, and the GFDL is included with
+ several XEmacs packages and Emacs. You can also visit the GNU home page
+ at http://www.gnu.org/licenses/ where the GPL and GFDL (as well as the
+ Library/Lesser GPL) are available for browsing. Finally, you can write
+ to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA, and request a copy.
+
+Q2.2 Are there updated versions?
+A2.2 Perhaps. See Phil's Emacs page at http://stuff.mit.edu/iap/emacs/ and/or
+ http://www.gnu.org/software/emacs/tour/.
+
+Q2.3 Can I see an HTML version?
+A2.3 Yes, at Phil's site and at gnu.org (see A2.1).
+
+Q2.4 Will an HTML version be included in the future?
+A2.4 Patches welcome! Ask about how to contribute to the XEmacs package, or
+ lobby for inclusion of new/updated content at <xemacs-beta(a)xemacs.org>.
+"
)))
;;; guided-tour.el ends here
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[pkgs] New: guided-tour
16 years, 11 months
Stephen J. Turnbull
xemacs-packages
New package: guided-tour
This package provides slides from Phil Sung's "Guided Tour of Emacs",
downloaded from http://stuff.mit.edu/iap/emacs/ on February 18, 2007.
The slides are available in both PDF and Open Document presentation
format. HTML and a updated HTML version are likely to be added later.
A few comments on the sample package I posted are still trickling in,
and I'm still hoping for comments from Phil Sung, so I'll delay a
commit for a couple of days.
There's one minor potential issue. This package inserts references to
itself in the menubar Help menu via auto-autoloads; technically I
suppose that could be considered a violation of the policy that
packages shouldn't activate themselves, but I can't see any harm in
hooking new items into the menus.
For the future, besides improvements to the package itself, I hear
that GNU Emacs will be putting a pointer to the Guided Tour in the
splash screen. Seems like a good idea to me (independent of keeping
up with the Gnubies). What do others think?
The patch provided here contains only the package infrastructure and
elisp file that insinuates the menubar. A prototype version of the
package is available at
http://turnbull.sk.tsukuba.ac.jp/Tools/XEmacs/guided-tour/
cvs diff -U 0 -N ChangeLog .cvsignore Makefile package-info.in guided-tour.el
Index: ChangeLog
===================================================================
RCS file: ChangeLog
diff -N ChangeLog
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ChangeLog 4 May 2007 10:51:57 -0000
＠＠ -0,0 +1,30 ＠＠
+2007-05-03 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ Create package.
+
+ * emacs-slides-1.odp:
+ * emacs-slides-2.odp:
+ * emacs-slides-3.odp:
+ * emacs-slides-1.pdf:
+ * emacs-slides-2.pdf:
+ * emacs-slides-3.pdf:
+ Import Phil Sung's "Guided Tour" content, from
+ http://stuff.mit.edu/iap/emacs/ ＠2007-02-18T09:15.
+
+ Note: Phil graciously licensed these to XEmacs under the MIT/X11
+ license allowing us to use *these versions only* in any way we
+ might want to inside of XEmacs (specifically, we can freely use
+ this content in our Texinfo manuals), but asks that we distribute
+ only under the GPL or GFDL or both. The content is copyright-
+ assigned to the FSF, and is publicly licensed only under the GPL
+ and GFDL (as of this writing). When in doubt as to the intent of
+ the permissions for use of content, ask Phil first, don't rely on
+ the letter of the law or licenses.
+
+ * package-info.in:
+ * Makefile:
+ * ChangeLog:
+ New. Package infrastructure.
+
+ * guided-tour.el:
+ New. Menuing infrastructure.
Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ .cvsignore 4 May 2007 10:51:57 -0000
＠＠ -0,0 +1,4 ＠＠
+#.*#
+.#*
+*~
+*.elc
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile 4 May 2007 10:51:57 -0000
＠＠ -0,0 +1,34 ＠＠
+# Makefile for the Guided Tour to Emacs
+
+# 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.
+
+VERSION = 0.50
+AUTHOR_VERSION =
+MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
+PACKAGE = guided-tour
+PKG_TYPE = regular
+REQUIRES =
+CATEGORY = standard
+
+ELCS = guided-tour.elc
+
+DATA_FILES = emacs-slides-1.pdf emacs-slides-2.pdf emacs-slides-3.pdf \
+ emacs-slides-1.odp emacs-slides-2.odp emacs-slides-3.odp
+DATA_DEST = guided-tour
+
+include ../../XEmacs.rules
Index: package-info.in
===================================================================
RCS file: package-info.in
diff -N package-info.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ package-info.in 4 May 2007 10:51:57 -0000
＠＠ -0,0 +1,19 ＠＠
+(guided-tour
+ (standards-version 1.1
+ version VERSION
+ author-version AUTHOR_VERSION
+ date DATE
+ build-date BUILD_DATE
+ maintainer MAINTAINER
+ distribution xemacs
+ priority high
+ category CATEGORY
+ dump nil
+ description "Phil Sung's Guided Tour of Emacs."
+ filename FILENAME
+ md5sum MD5SUM
+ size SIZE
+ provides (guided-tour)
+ requires (REQUIRES)
+ type regular
+))
Index: guided-tour.el
===================================================================
RCS file: guided-tour.el
diff -N guided-tour.el
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ guided-tour.el 4 May 2007 10:51:57 -0000
＠＠ -0,0 +1,189 ＠＠
+;;; guided-tour.el --- functions for viewing Phil Sung's Emacs Guided Tour
+
+;; Copyright 2007 Free Software Foundation, Inc.
+
+;; Author: Stephen J. Turnbull <stephen(a)xemacs.org>
+;; Maintainer: XEmacs Development Team
+;; Created: 2007-05-02
+;; Keywords: doc
+
+;; The permissions notice is contained in the function
+;; `guided-tour-about' at the end of this file. Under the terms
+;; granted, you may modify that function, but the appropriate
+;; permissions notice must remain in this file somewhere.
+
+;;; Synched up with: Not in FSF.
+
+;;; Commentary:
+
+;; Thanks to Jason Spiro and Phil Sung for making substantial effort
+;; to make this content as useful to XEmacs as possible.
+
+;;; Code:
+
+;; Variables
+
+(defgroup guided-tour nil "Phil Sung's Emacs Guided Tour")
+
+(defcustom guided-tour-odp-viewer "ooimpress"
+ "Path to program able to view Open Document Format presentations.
+Program is invoked in a shell, so PATH is searched."
+:type '(choice string
+ (const "ooimpress")
+ (const "open" :doc "Useful on Mac OS X"))
+:group 'guided-tour)
+
+(defcustom guided-tour-pdf-viewer "xpdf"
+ "Path to program able to view Portable Document Format documents.
+Program is invoked in a shell, so PATH is searched."
+:type '(choice string
+ (const "xpdf")
+ (const "gv")
+ (const "open" :doc "Useful on Mac OS X"))
+:group 'guided-tour)
+
+(defconst guided-tour-submenu
+ '("A Guided Tour of Emacs"
+ ["Guided Tour, Part %_1 (OOo)" guided-tour-odp-1]
+ ["Guided Tour, Part %_2 (OOo)" guided-tour-odp-2]
+ ["Guided Tour, Part %_3 (OOo)" guided-tour-odp-3]
+ ["Guided Tour, Part %_1 (PDF)" guided-tour-pdf-1]
+ ["Guided Tour, Part %_2 (PDF)" guided-tour-pdf-2]
+ ["Guided Tour, Part %_3 (PDF)" guided-tour-pdf-3]
+ ["About COPYING the Tour" guided-tour-about])
+ "The submenu for Phil Sung's \"Guided Tour of Emacs\".")
+
+(defvar guided-tour-insinuate-menubar nil
+ "If non-nil, inhibits insinuation of the menubar.
+Note that if you make this nil and reinsinuate, you are responsible for
+removing any existing instances of the submenu.")
+
+;; Functions
+
+;; Helper functions
+
+;; #### this probably should move to help.el or menubar-items.el
+(defun guided-tour-find-menubar-help-menu (&optional menubar)
+ "Return the Help submenu for MENUBAR if present, else nil."
+ (assoc "%_Help" (or menubar default-menubar)))
+
+(defun guided-tour-about-xemacs-index (menu)
+ "Return the (zero-based) index of the About XEmacs item in MENU.
+Returns nil if not present."
+ ;; #### Of course we should actually search for it....
+ ;; Does easy-menu provide functions for this? It should....
+ (let ((item (cadr menu)))
+ (if (and (vectorp item) (eq 'about-xemacs (aref item 1)))
+ 0
+ nil)))
+
+;; Initialization
+
+;;;###autoload
+(defun guided-tour-insinuate-menubar ()
+ "Add Phil Sung's Guided Tour of Emacs to the default menubar."
+ (unless guided-tour-insinuate-menubar
+ (setq guided-tour-insinuate-menubar t)
+ (let* ((help (guided-tour-find-menubar-help-menu)))
+ (setcdr help (nconc (if (eq 0 (guided-tour-about-xemacs-index help))
+ (list (cadr help) guided-tour-submenu)
+ (list guided-tour-submenu (cadr help)))
+ (cddr help))))))
+
+;; Is this OK? Don't see how it really hurts.
+;;;###autoload
+(guided-tour-insinuate-menubar)
+
+;; The Guided Tour
+
+(defun guided-tour (type part)
+ "Start the Guided Tour with TYPE viewer, in Part PART."
+ (interactive "sWhich format? \nnWhich part? ")
+ (let ((viewer (symbol-value (intern (concat "guided-tour-" type "-viewer"))))
+ (file (format "emacs-slides-%d.%s" part type)))
+ (message "\
+`M-x guided-tour-about RET' for FAQ and licensing.")
+ (shell-command (format "%s %s" viewer (or (locate-data-file file) file)))))
+
+(defun guided-tour-odp-1 ()
+ "Start up the Guided Tour of Emacs, part 1, as an Open Office presentation."
+ (interactive)
+ (guided-tour "odp" 1))
+
+(defun guided-tour-odp-2 ()
+ "Start up the Guided Tour of Emacs, part 2, as an Open Office presentation."
+ (interactive)
+ (guided-tour "odp" 2))
+
+(defun guided-tour-odp-3 ()
+ "Start up the Guided Tour of Emacs, part 3, as an Open Office presentation."
+ (interactive)
+ (guided-tour "odp" 3))
+
+(defun guided-tour-pdf-1 ()
+ "Start up the Guided Tour of Emacs, part 1, in a PDF viewer."
+ (interactive)
+ (guided-tour "pdf" 1))
+
+(defun guided-tour-pdf-2 ()
+ "Start up the Guided Tour of Emacs, part 2, in a PDF viewer."
+ (interactive)
+ (guided-tour "pdf" 2))
+
+(defun guided-tour-pdf-3 ()
+ "Start up the Guided Tour of Emacs, part 3, in a PDF viewer."
+ (interactive)
+ (guided-tour "pdf" 3))
+
+(defun guided-tour-about ()
+ "Document the Guided Tour."
+ (interactive)
+ (with-displaying-temp-buffer "*About the Guided Tour of Emacs*"
+ (princ "\
+
+ A Guided Tour of Emacs
+ Phil Sung
+
+This is the XEmacs package of the Guided Tour of Emacs.
+The slides are by Phil Sung. That's the important part. Send kudos to Phil.
+The XEmacs package is by Stephen Turnbull. Direct complaints about packaging
+to Steve via the XEmacs Developers mailing list <xemacs-beta(a)xemacs.org>.
+The FAQ follows the permissions notice.
+
+Copyright 2007 The Free Software Foundation Inc.
+
+The Guided Tour, is both free software and free content.
+
+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 published by
+the Free Software Foundation.
+
+You can redistribute it and/or modify it under the terms of GNU Free
+Documentation License; either version 1.2, or (at your option) any
+later version published by the Free Software Foundation.
+
+A verbatim or modified version can be redistributed under both
+licenses simultaneously, which is the authors' preferred method.
+
+The Guided Tour 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 and/or the GNU Free Documentation License for more
+details.
+
+FAQ
+
+Q1. I select a tour from the menu, but nothing happens!
+A1. You probably need to configure a viewer. C-h v guided-tour-pdf-viewer RET
+ or C-h v guided-tour-odp-viewer RET.
+"
+
+;; #### Find web, C-h, and maybe file locations for licenses, then add above.
+;; 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.
+)))
+
+;;; guided-tour.el ends here
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC21.5] Minor fixups from resize echo area patch
16 years, 11 months
Stephen J. Turnbull
APPROVE COMMIT 21.5
Parts of this patch were previously committed due to build breakage.
This patch fixes build breakage due to undefined references to
resize-minibuffer-mode in simple.el that I introduced in the previous
patch, by loading resize-minibuffer before loading simple.
I also made some small changes to resize-minibuffer.el, removing the
CVS Id cookie and an autoload cookie. The former is a PITA, the
latter is a potential real problem.
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.792
diff -u -U0 -r1.792 ChangeLog
--- lisp/ChangeLog 30 Apr 2007 16:16:48 -0000 1.792
+++ lisp/ChangeLog 1 May 2007 14:27:34 -0000
＠＠ -0,0 +1,9 ＠＠
+2007-05-01 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * dumped-lisp.el (preloaded-file-list): Move resize-minibuffer
+ before simple.
+
+ * resize-minibuffer.el: Remove CVS $Id$ cookie..
+
+ * resize-minibuffer.el (resize-minibuffer-mode): Remove autoload.
+
Index: lisp/resize-minibuffer.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/resize-minibuffer.el,v
retrieving revision 1.5
diff -u -r1.5 resize-minibuffer.el
--- lisp/resize-minibuffer.el 30 Apr 2007 16:16:51 -0000 1.5
+++ lisp/resize-minibuffer.el 1 May 2007 14:27:39 -0000
＠＠ -36,8 +36,6 ＠＠
;; This file has received maintenance by the XEmacs development team.
-;; $Id: resize-minibuffer.el,v 1.5 2007/04/30 16:16:51 stephent Exp $
-
;; This package allows the entire contents (or as much as possible) of the
;; minibuffer to be visible at once when typing. As the end of a line is
;; reached, the minibuffer will resize itself. When the user is done
＠＠ -122,7 +120,6 ＠＠
:group 'resize-minibuffer)
-;;;###autoload
(defun resize-minibuffer-mode (&optional prefix)
"Enable or disable resize-minibuffer mode.
A negative prefix argument disables this mode. A positive argument or
Index: lisp/dumped-lisp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/dumped-lisp.el,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- lisp/dumped-lisp.el 29 Dec 2006 18:09:43 -0000 1.61
+++ lisp/dumped-lisp.el 30 Apr 2007 19:50:53 -0000 1.62
＠＠ -72,6 +72,7 ＠＠
"undo-stack"
"window" ; simple needs `save-window-excursion'
"window-xemacs"
+ "resize-minibuffer" ; simple needs `resize-minibuffer-mode'
"simple"
"newcomment"
"keydefs" ; Before loaddefs so that keymap vars exist.
＠＠ -288,7 +289,6 ＠＠
"fontl-hooks"
"auto-show"
"paragraphs" ; needs easy-mmode, coding
- "resize-minibuffer"
(when (featurep 'ldap) "ldap")
;; (when (featurep 'energize) "energize/energize-load.el")
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
[AC21.5] Add support for fc-version
16 years, 11 months
Stephen J. Turnbull
APPROVE COMMIT 21.5
Having run into a header/library mismatch, it occurred to me it would
be useful to be able to check this. With this patch, fc-get-version
fetches the version of the library lined at runtime, while fc-version
contains the version of the library whose headers were #include'd.
xft-version is now a constant.
Minor documentation improvements.
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1057
diff -u -U0 -r1.1057 ChangeLog
--- src/ChangeLog 30 Apr 2007 16:46:29 -0000 1.1057
+++ src/ChangeLog 1 May 2007 14:18:35 -0000
＠＠ -0,0 +1,8 ＠＠
+2007-05-01 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * font-mgr.c (Qfontsetp): Remove unused declaration.
+
+ * font-mgr.c (xft-version): Make it a DEFVAR_CONST_INT.
+
+ * font-mgr.c (fc-version): New: fontconfig.h version.
+
Index: src/font-mgr.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/font-mgr.c,v
retrieving revision 1.6
diff -u -r1.6 font-mgr.c
--- src/font-mgr.c 30 Apr 2007 16:46:36 -0000 1.6
+++ src/font-mgr.c 1 May 2007 14:18:42 -0000
＠＠ -69,15 +69,14 ＠＠
Lisp_Object Qfont_mgr;
Lisp_Object Qfc_patternp;
-Lisp_Object Qfc_fontsetp;
/* Lisp_Object Qfc_result_match; */ /* FcResultMatch */
Lisp_Object Qfc_result_type_mismatch; /* FcResultTypeMismatch */
Lisp_Object Qfc_result_no_match; /* FcResultNoMatch */
Lisp_Object Qfc_result_no_id; /* FcResultNoId */
Lisp_Object Qfc_internal_error;
Lisp_Object Vxlfd_font_name_regexp; /* #### Really needed? */
-Lisp_Object Vxft_version;
-/* Lisp_Object Vfc_version; */ /* #### Should have this, too! */
+Fixnum xft_version;
+Fixnum fc_version;
Fixnum debug_xft; /* Set to 1 enables lots of obnoxious messages.
Setting it to 2 or 3 enables even more. */
#ifdef FONTCONFIG_EXPOSE_CONFIG
＠＠ -1043,10 +1042,12 ＠＠
DEFUN("fc-get-version", Ffc_get_version, 0, 0, 0, /*
-- Function: int FcGetVersion (void)
Returns the version number of the library.
- XEmacs: No, this should NOT return a pretty string.
+XEmacs: No, this should NOT return a pretty string.
(let ((i (fc-get-version)))
(format "%d.%d.%d" (/ i 10000) (mod (/ i 100) 100) (mod i 100)))
- gives the usual x.y.z format. */
+gives the usual x.y.z format. This is the version of the .so. It can be
+checked against `fc-version', which is the version of fontconfig.h.
+It's probably not a disaster if `(> (fc-get-version) fc-version)'. */
())
{
return make_int (FcGetVersion ());
＠＠ -1258,7 +1259,7 ＠＠
void
vars_of_font_mgr (void)
{
- /* #### The next two functions belong somewhere else. */
+ /* #### The next two DEFVARs belong somewhere else. */
/* #### I know, but the right fix is use the generic debug facility. */
DEFVAR_INT ("xft-debug-level", &debug_xft /*
＠＠ -1269,10 +1270,17 ＠＠
*/ );
debug_xft = 1;
- DEFVAR_LISP("xft-version", &Vxft_version /*
+ DEFVAR_CONST_INT("xft-version", &xft_version /*
The major version number of the Xft library being used.
*/ );
- Vxft_version = make_int(XFT_VERSION);
+ xft_version = XFT_VERSION;
+
+ DEFVAR_CONST_INT("fc-version", &fc_version /*
+The version number of fontconfig.h. It can be checked against
+`(fc-get-version)', which is the version of the .so.
+It's probably not a disaster if `(> (fc-get-version) fc-version)'.
+*/ );
+ fc_version = FC_VERSION;
Fprovide (intern ("font-mgr"));
}
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches
