Mercurial > emacs
changeset 99588:a61ecfde8504
(ns-do-applescript, ns-popup-font-panel): Declare.
(ns-show-manual, menu-bar-help-menu): Update for merge of ns-emacs into
main Emacs manual.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 15 Nov 2008 22:29:59 +0000 |
| parents | 99efedb95ea8 |
| children | 22a0d4deace0 |
| files | lisp/term/ns-win.el |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/ns-win.el Sat Nov 15 22:20:43 2008 +0000 +++ b/lisp/term/ns-win.el Sat Nov 15 22:29:59 2008 +0000 @@ -330,6 +330,7 @@ (defvaralias 'mac-control-modifier 'ns-control-modifier) (defvaralias 'mac-option-modifier 'ns-option-modifier) (defvaralias 'mac-function-modifier 'ns-function-modifier) +(declare-function ns-do-applescript "nsfns.m" (script)) (defalias 'do-applescript 'ns-do-applescript) @@ -348,7 +349,9 @@ :group 'ns (if ns-extended-platform-support-mode (progn - (defun ns-show-manual () "Show Emacs.app manual" (interactive) (info "ns-emacs")) + (defun ns-show-manual () "Show Emacs.app section in the Emacs manual" + (interactive) + (info "(emacs)Mac OS")) (setq where-is-preferred-modifier 'super) (setq scroll-preserve-screen-position t) (transient-mark-mode 1) @@ -359,7 +362,7 @@ (easy-menu-add-item global-map '(menu-bar) (cons "File" menu-bar-ns-file-menu) 'edit) (define-key menu-bar-help-menu [ns-manual] - '(menu-item "Emacs.app Manual" ns-show-manual))) + '(menu-item "Emacs.app Manual Chapter" ns-show-manual))) (progn ;; Undo everything above. (fmakunbound 'ns-show-manual) @@ -1251,6 +1254,7 @@ (setq scalable-fonts-allowed t) ;; Set to use font panel instead +(declare-function ns-popup-font-panel "nsfns.m" (&optional frame)) (defalias 'generate-fontset-menu 'ns-popup-font-panel) (defalias 'mouse-set-font 'ns-popup-font-panel)