From 38f4308d1b3c38ac4d1c5c5b1acb610a66e15d24 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Wed, 16 Jul 2008 02:46:09 +0000 Subject: [PATCH] remove easy-mmode from loadup.el before ns-win; correct docs in ns-win --- lisp/ChangeLog | 10 +++++++++- lisp/loadup.el | 1 - lisp/term/ns-win.el | 5 +++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a22e595f509..b66b1b3882a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2008-07-16 Adrian Robert + + * loadup.el: Remove load of easy-mmode prior to ns-win when NS + windowing is used. + * term/ns-win.el (ns-extended-platform-support-mode): + Corrected/improved documentation. + 2008-07-16 Glenn Morris * paths.el (rmail-spool-directory): Remove settings for systems that are @@ -31,7 +38,8 @@ * frame.el (make-frame-on-display): Follow code for 'x in initializing 'ns window system if need be. (various): Add 'ns as described above. - * loadup.el: Load ns-win.el if ns-windowing is active. + * loadup.el: Load ns-win.el, easy-menu.el, easy-mmode.el if + ns-windowing is active. * startup.el (command-line-ns-option-alist): New constant to handle NS windowing system specific command line args analogous to how they are handled for X windows. diff --git a/lisp/loadup.el b/lisp/loadup.el index bd4d08b0449..30a26e902b3 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -215,7 +215,6 @@ (if (featurep 'ns-windowing) (progn (load "emacs-lisp/easymenu") ;; for platform-related menu adjustments - (load "emacs-lisp/easy-mmode") (load "term/ns-win"))) (if (fboundp 'atan) ; preload some constants and (progn ; floating pt. functions if we have float support. diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index da0ec4744e2..ed1037bbdd5 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -333,9 +333,10 @@ The properties returned may include `top', `left', `height', and `width'." (define-minor-mode ns-extended-platform-support-mode "Toggle NS extended platform support features. When this mode is active (no modeline indicator): - - File menus is altered slightly in keeping with conventions. + - File menu is altered slightly in keeping with conventions. - Meta-up, meta-down are bound to scroll window up and down one line. - - Meta-p, Meta-n navigate forwards and backwards in the mark ring." + - Screen position is preserved in scrolling. + - Transient mark mode is activated" :init-value nil :global t :group 'ns