Mercurial > emacs
comparison lisp/menu-bar.el @ 111262:029e4783cbae
Merge changes from emacs-23 branch
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 31 Oct 2010 10:40:01 -0400 |
parents | cdad894f9ed0 1c494f4d6d40 |
children | 869f03cdb254 |
comparison
equal
deleted
inserted
replaced
111250:707dcc885f00 | 111262:029e4783cbae |
---|---|
81 (and (featurep 'ns) | 81 (and (featurep 'ns) |
82 (not (eq system-type 'darwin)) | 82 (not (eq system-type 'darwin)) |
83 (define-key global-map [menu-bar help-menu] | 83 (define-key global-map [menu-bar help-menu] |
84 (cons (purecopy "Info") menu-bar-help-menu))) | 84 (cons (purecopy "Info") menu-bar-help-menu))) |
85 | 85 |
86 ;; This alias is for compatibility with 19.28 and before. | 86 ;; Only declared obsolete (and only made a proper alias) in 23.3. |
87 (defvar menu-bar-files-menu menu-bar-file-menu) | 87 (define-obsolete-variable-alias 'menu-bar-files-menu 'menu-bar-file-menu "22.1") |
88 | 88 |
89 ;; This is referenced by some code below; it is defined in uniquify.el | 89 ;; This is referenced by some code below; it is defined in uniquify.el |
90 (defvar uniquify-buffer-name-style) | 90 (defvar uniquify-buffer-name-style) |
91 | 91 |
92 ;; From emulation/cua-base.el; used below | 92 ;; From emulation/cua-base.el; used below |