aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/term/ns-win.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c502a3affc..aa62fd9a70b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-02-25 Jan Djärv <jan.h.d@swipnet.se>
2
3 * term/ns-win.el (global-map): Bind ns-drag-file to
4 ns-find-file (Bug#5855, Bug#10050).
5
6
12012-02-25 Andreas Schwab <schwab@linux-m68k.org> 72012-02-25 Andreas Schwab <schwab@linux-m68k.org>
2 8
3 * calendar/parse-time.el (parse-time-string): Allow extractor to 9 * calendar/parse-time.el (parse-time-string): Allow extractor to
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 2782d63b719..b681ec3440f 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -163,7 +163,7 @@ The properties returned may include `top', `left', `height', and `width'."
163(define-key global-map [ns-power-off] 'save-buffers-kill-emacs) 163(define-key global-map [ns-power-off] 'save-buffers-kill-emacs)
164(define-key global-map [ns-open-file] 'ns-find-file) 164(define-key global-map [ns-open-file] 'ns-find-file)
165(define-key global-map [ns-open-temp-file] [ns-open-file]) 165(define-key global-map [ns-open-temp-file] [ns-open-file])
166(define-key global-map [ns-drag-file] 'ns-insert-file) 166(define-key global-map [ns-drag-file] 'ns-find-file)
167(define-key global-map [ns-drag-color] 'ns-set-foreground-at-mouse) 167(define-key global-map [ns-drag-color] 'ns-set-foreground-at-mouse)
168(define-key global-map [S-ns-drag-color] 'ns-set-background-at-mouse) 168(define-key global-map [S-ns-drag-color] 'ns-set-background-at-mouse)
169(define-key global-map [ns-drag-text] 'ns-insert-text) 169(define-key global-map [ns-drag-text] 'ns-insert-text)