Commits

Anonymous committed bec17a7

Cosmetic changes, more viewers in defcustoms. <87r6pvclr7.fsf@uwakimon.sk.tsukuba.ac.jp>

Comments (0)

Files changed (2)

+2007-05-05  Stephen J. Turnbull  <stephen@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@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ä on XEmacs Beta.
+	<c241693f0705031325g5f10c8dfl689dd5ed78233710@mail.gmail.com>
+	<200705040928.41802.scop@xemacs.org>
+	(guided-tour-odp-viewer):
+	(guided-tour-pdf-viewer):
+	Use it.
+
 2007-05-03  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	Create package.
 ;; 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.
 
 
 ;; 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
     ["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.
 
 ;;;###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)))
 
 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
+
+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@xemacs.org>.
 "
-
-;; #### 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