Updates to my about.el bio.

[sxemacs] / lisp / menubar-items.el

diff --git a/lisp/menubar-items.el b/lisp/menubar-items.el
index 56388a3..8650252 100644 (file)
--- a/lisp/menubar-items.el
+++ b/lisp/menubar-items.el
@@ -58,9 +58,9 @@ Return a list of (label value) lists with labels truncated to last
 LABEL-LENGTH characters of value."
   (mapcar #'(lambda (x)
              (if (<= (length x) label-length)
-                  (list x x)
-                (list
-                 (concat "..." (substring x (- label-length))) x)))
+                 (list x x)
+               (list
+                (concat "..." (substring x (- label-length))) x)))
          (if (<= (length list) count)
              list
            (butlast list (- (length list) count)))))
@@ -497,11 +497,6 @@ See also `menu-split-long-menu'."
                   (menu-split-long-menu
                    (submenu-generate-accelerator-spec
                     (package-ui-download-menu)))))
-       ("%_Pre-Releases"
-        :filter (lambda (&rest junk)
-                  (menu-split-long-menu
-                   (submenu-generate-accelerator-spec
-                    (package-ui-pre-release-download-menu)))))
        ("%_Site Releases"
         :filter (lambda (&rest junk)
                   (menu-split-long-menu
@@ -531,11 +526,11 @@ See also `menu-split-long-menu'."
             menu
           (let ((items
                  (submenu-generate-accelerator-spec
-                   (mapcar #'(lambda (label-value)
+                  (mapcar #'(lambda (label-value)
                               (vector (first label-value)
                                       (list 'grep (second label-value))))
                           (Menubar-items-truncate-history
-                            grep-history 10 50)))))
+                           grep-history 10 50)))))
             (append menu '("---") items))))
        ["%_Grep..." grep :active (fboundp 'grep)]
        ["%_Kill Grep" kill-compilation
@@ -644,7 +639,7 @@ See also `menu-split-long-menu'."
                               (vector (first label-value)
                                       (list 'compile (second label-value))))
                           (Menubar-items-truncate-history
-                            compile-history 10 50)))))
+                           compile-history 10 50)))))
             (append menu '("---") items))))
        ["%_Compile..." compile :active (fboundp 'compile)]
        ["%_Repeat Compilation" recompile :active (fboundp 'recompile)]
@@ -987,12 +982,12 @@ See also `menu-split-long-menu'."
         :active (and (boundp 'browse-url-browser-function)
                      (fboundp 'browse-url-w3)
                      (fboundp 'w3-fetch))]
-        ["Emacs-%_W3 (gnudoit)"
-         (customize-set-variable 'browse-url-browser-function 'browse-url-w3-gnudoit)
-         :style radio
-         :selected (and (boundp 'browse-url-browser-function)
-                        (eq browse-url-browser-function
-                            'browse-url-w3-gnudoit))
+       ["Emacs-%_W3 (gnuclient)"
+        (customize-set-variable 'browse-url-browser-function 'browse-url-w3-gnudoit)
+        :style radio
+        :selected (and (boundp 'browse-url-browser-function)
+                       (eq browse-url-browser-function
+                           'browse-url-w3-gnudoit))
         :active (and (boundp 'browse-url-browser-function)
                      (fboundp 'browse-url-w3-gnudoit))]
        ["%_Netscape"
@@ -1555,7 +1550,8 @@ See also `menu-split-long-menu'."
       ["Edit I%_nit File"
        ;; #### there should be something that holds the name that the init
        ;; file should be created as, when it's not present.
-       (progn (find-file (or user-init-file "~/.sxemacs/init.el"))
+       (progn (find-file (or user-init-file
+                            (expand-file-name "init.el" user-init-directory)))
              (or (eq major-mode 'emacs-lisp-mode)
                  (emacs-lisp-mode)))]
       ["%_Save Options to Custom File" customize-save-customized]
@@ -1598,10 +1594,6 @@ See also `menu-split-long-menu'."
        ["Sample %_init.el"
        (find-file (locate-data-file "sample.init.el"))
        :active (locate-data-file "sample.init.el")]
-       ["Sample .%_gtkrc"
-       (find-file (locate-data-file "sample.gtkrc"))
-       :included (featurep 'gtk)
-       :active (locate-data-file "sample.gtkrc")]
        ["Sample .%_Xdefaults"
        (find-file (locate-data-file "sample.Xdefaults"))
        :included (featurep 'x)