aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorAdrian Robert2008-07-27 19:20:38 +0000
committerAdrian Robert2008-07-27 19:20:38 +0000
commit583ff3c3ba1cfdbf6a7d809a402c5cddc40427da (patch)
tree242f65fcd37e7bf863191677c5587c616f174156 /lisp
parent9e2a2647758db83b490e2993aa31cd4607305a82 (diff)
downloademacs-583ff3c3ba1cfdbf6a7d809a402c5cddc40427da.tar.gz
emacs-583ff3c3ba1cfdbf6a7d809a402c5cddc40427da.zip
rename do-applescript,do_applescript in keeping with NS code conventions
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/ns-win.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30680d79a62..9cee8b49b90 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-07-27 Adrian Robert <Adrian.B.Robert@gmail.com>
2
3 * term/ns-win.el (do-applescript): New alias in carbon-compat section.
4
12008-07-27 Dan Nicolaescu <dann@ics.uci.edu> 52008-07-27 Dan Nicolaescu <dann@ics.uci.edu>
2 6
3 Remove support for Mac Carbon. 7 Remove support for Mac Carbon.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 6b332976a4e..bdea472904d 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -319,6 +319,8 @@ this defaults to \"printenv\"."
319(defvaralias 'mac-control-modifier 'ns-control-modifier) 319(defvaralias 'mac-control-modifier 'ns-control-modifier)
320(defvaralias 'mac-option-modifier 'ns-option-modifier) 320(defvaralias 'mac-option-modifier 'ns-option-modifier)
321(defvaralias 'mac-function-modifier 'ns-function-modifier) 321(defvaralias 'mac-function-modifier 'ns-function-modifier)
322(defalias 'do-applescript 'ns-do-applescript)
323
322 324
323(defvar menu-bar-ns-file-menu) ; below 325(defvar menu-bar-ns-file-menu) ; below
324 326
@@ -328,7 +330,6 @@ this defaults to \"printenv\"."
328 "Toggle Nextstep extended platform support features. 330 "Toggle Nextstep extended platform support features.
329 When this mode is active (no modeline indicator): 331 When this mode is active (no modeline indicator):
330 - File menu is altered slightly in keeping with conventions. 332 - File menu is altered slightly in keeping with conventions.
331 - Meta-up, meta-down are bound to scroll window up and down one line.
332 - Screen position is preserved in scrolling. 333 - Screen position is preserved in scrolling.
333 - Transient mark mode is activated" 334 - Transient mark mode is activated"
334 :init-value nil 335 :init-value nil