X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmenubar-items.el;h=5f2767f613ecd845a1da7bfab8beaa3d0707ea43;hb=23348e8db2d12e44f8b60079dae1458bf5632f35;hp=ad67f0dcf98bda09c2ff5067348958d80a246963;hpb=677eed28458b5264298a1e4a49f2a175d6ffe175;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/menubar-items.el b/lisp/menubar-items.el
index ad67f0d..5f2767f 100644
--- a/lisp/menubar-items.el
+++ b/lisp/menubar-items.el
@@ -54,12 +54,18 @@
 
 ;;; Code:
 
-(defun Menubar-items-truncate-list (list n)
+(defun Menubar-items-truncate-history (list count label-length)
+  "Truncate a history LIST to first COUNT items.
+Return a list of (label value) lists with labels truncated to last
+LABEL-LENGTH characters of value."
   (mapcar #'(lambda (x)
-	      (if (<= (length x) 50) x (concat "..." (substring x -50))))
-	  (if (<= (length list) n)
+	      (if (<= (length x) label-length)
+                  (list x x)
+                (list
+                 (concat "..." (substring x (- label-length))) x)))
+	  (if (<= (length list) count)
 	      list
-	    (butlast list (- (length list) n)))))
+	    (butlast list (- (length list) count)))))
 
 (defun submenu-generate-accelerator-spec (list &optional omit-chars-list)
   "Add auto-generated accelerator specifications to a submenu.
@@ -141,7 +147,7 @@ which will not be used as accelerators."
       ["Save %_As..." write-file]
       ["Save So%_me Buffers" save-some-buffers]
       "-----"
-      ,@(if (eq system-type 'windows-nt)
+      ,@(if (valid-specifier-tag-p 'msprinter)
 	  '(["Page Set%_up..." generic-page-setup]))
       ["%_Print" generic-print-buffer
        :active (or (valid-specifier-tag-p 'msprinter)
@@ -150,7 +156,7 @@ which will not be used as accelerators."
        :suffix (if (region-active-p) "Selection..."
 		 (if put-buffer-names-in-file-menu (concat (buffer-name) "...")
 		   "..."))]
-      ,@(unless (eq system-type 'windows-nt)
+      ,@(unless (valid-specifier-tag-p 'msprinter)
 	  '(["Prett%_y-Print" ps-print-buffer-with-faces
 	     :active (fboundp 'ps-print-buffer-with-faces)
 	     :suffix (if put-buffer-names-in-file-menu (buffer-name) "")]))
@@ -435,10 +441,11 @@ which will not be used as accelerators."
 	     menu
 	   (let ((items
 		  (submenu-generate-accelerator-spec
-		   (mapcar #'(lambda (string)
-			       (vector string
-				       (list 'grep string)))
-			   (Menubar-items-truncate-list grep-history 10)))))
+                   (mapcar #'(lambda (label-value)
+			       (vector (first label-value)
+				       (list 'grep (second label-value))))
+			   (Menubar-items-truncate-history
+                            grep-history 10 50)))))
 	     (append menu '("---") items))))
        ["%_Grep..." grep :active (fboundp 'grep)]
        ["%_Kill Grep" kill-compilation
@@ -543,10 +550,11 @@ which will not be used as accelerators."
 	     menu
 	   (let ((items
 		  (submenu-generate-accelerator-spec
-		   (mapcar #'(lambda (string)
-			       (vector string
-				       (list 'compile string)))
-			   (Menubar-items-truncate-list compile-history 10)))))
+		   (mapcar #'(lambda (label-value)
+			       (vector (first label-value)
+				       (list 'compile (second label-value))))
+			   (Menubar-items-truncate-history
+                            compile-history 10 50)))))
 	     (append menu '("---") items))))
        ["%_Compile..." compile :active (fboundp 'compile)]
        ["%_Repeat Compilation" recompile :active (fboundp 'recompile)]