[AUCTeX-diffs] Changes to auctex/toolbar-x.el,v

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    08/08/02 20:19:27

Index: toolbar-x.el
===================================================================
RCS file: /cvsroot/auctex/auctex/toolbar-x.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- toolbar-x.el        28 Jul 2008 21:11:23 -0000      1.19
+++ toolbar-x.el        2 Aug 2008 20:19:27 -0000       1.20
@@ -1,6 +1,6 @@
 ;;; toolbar-x.el --- fancy toolbar handling in Emacs and XEmacs
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2008 Free Software Foundation, Inc.
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -1974,15 +1974,30 @@
 
 
 (defconst toolbarx-default-toolbar-meaning-alist
-  '((separator :image "sep" :command t :enable nil :help "")
-    (open-file :image ["new" toolbar-file-icon]
+  `((separator :image "sep" :command t :enable nil :help "")
+
+    (,(if (and (not (featurep 'xemacs)) (>= emacs-major-version 22))
+         'new-file
+       'open-file)
+     :image ["new" toolbar-file-icon]
               :command [find-file toolbar-open]
               :enable [(not (window-minibuffer-p
                              (frame-selected-window menu-updating-frame)))
                        t]
-              :help ["Read a file into an Emacs buffer" "Open a file"])
+     :help ["Specify a new file's name, to edit the file" "Visit new file"])
+
+    ,(when (and (not (featurep 'xemacs)) (>= emacs-major-version 22))
+       '(open-file :image ["open" toolbar-file-icon]
+                  :command [menu-find-file-existing toolbar-open]
+                  :enable [(not (window-minibuffer-p
+                                 (frame-selected-window menu-updating-frame)))
+                           t]
+                  :help ["Read a file into an Emacs buffer" "Open a file"]))
 
-    (dired :image ["open" toolbar-folder-icon]
+    (dired :image [,(if (>= emacs-major-version 22)
+                       "diropen"
+                     "open")
+                  toolbar-folder-icon]
           :command [dired toolbar-dired]
           :help ["Read a directory, operate on its files" "Edit a directory"])
 
@@ -2113,11 +2128,11 @@
 The following buttons are available:
 
 * Both Emacs and XEmacs: `open-file', `dired', `save-buffer',
-`undo', `cut', `copy', `paste', `search-replace', `print-buffer',
-`spell-buffer', `info'.
+  `undo', `cut', `copy', `paste', `search-replace', `print-buffer',
+  `spell-buffer', `info'.
 
-* Emacs only: `write-file', `search-forward', `customize', `help',
-`kill-buffer', `exit-emacs'.
+* Emacs only: `new-file' (Emacs 22+) `write-file', `search-forward',
+  `customize', `help', `kill-buffer', `exit-emacs'.
 
 * XEmacs only: `mail', `compile', `debug', `news'.