Jan Djärv
525795c1bd
Make drop on NS/OSX behave the same as other platforms (Bug 5855 and 10050).
...
* doc/emacs/macos.texi (Mac / GNUstep Customization): Remove text about
ns-find-file and ns-drag-file (Bug#5855, Bug#10050).
* lisp/term/ns-win.el (global-map): Bind ns-drag-file to
ns-find-file (Bug#5855, Bug#10050).
2012-02-25 11:04:30 +01:00
Glenn Morris
acaf905b11
Add 2012 to FSF copyright years for Emacs files
2012-01-05 01:46:05 -08:00
Jan Djärv
c803b2b767
NS selection bug fix and cleanup, see thread C-g crash in C-x C-f (OSX Lion).
...
Thread is on emacs-devel.
* lisp/term/ns-win.el (ns-get-selection-internal)
(ns-store-selection-internal): Declare.
(ns-store-cut-buffer-internal, ns-get-cut-buffer-internal): Declare
as obsolete.
(ns-get-pasteboard, ns-paste-secondary): Use
ns-get-selection-internal.
(ns-set-pasteboard, ns-copy-including-secondary): Use
ns-store-selection-internal.
* src/nsselect.m (CUT_BUFFER_SUPPORT): Remove define.
(symbol_to_nsstring): Fix indentation.
(ns_symbol_to_pb): New function.
(Fns_get_selection_internal): Renamed from Fns_get_cut_buffer_internal.
(Fns_rotate_cut_buffers_internal): Removed.
(Fns_store_selection_internal): Renamed from
Fns_store_cut_buffer_internal.
(ns_get_foreign_selection, Fx_own_selection_internal)
(Fx_disown_selection_internal, Fx_selection_exists_p)
(Fns_get_selection_internal, Fns_store_selection_internal): Use
ns_symbol_to_pb and check if return value is nil.
(syms_of_nsselect): Remove ifdef CUT_BUFFER_SUPPORT. Remove
defsubr Sns_rotate_cut_buffers_internal. Sns_get_cut_buffer_internal
renamed to Sns_get_selection_internal, Sns_store_cut_buffer_internal
renamed to Sns_store_selection_internal.
(ns_handle_selection_request): Move code to Fx_own_selection_internal
and remove this function.
(ns_handle_selection_clear): Remove, never used.
(Fx_own_selection_internal): Move code from ns_handle_selection_request
here.
2011-12-18 14:49:38 +01:00
Paul Eggert
ee7683ebb7
Spelling fixes.
2011-11-22 23:03:56 -08:00
Juanma Barranquero
fe7a3057a3
Fix typos.
2011-11-20 20:35:27 +01:00
Glenn Morris
f6aa5bb177
ns-win.el fix for bug#10051
...
* lisp/term/ns-win.el (mode-line-frame-identification): Leave it alone.
2011-11-14 20:04:06 -05:00
Chong Yidong
ce3cefcca3
Change scroll-up/down bindings to Emacs 24's scroll-*-command.
...
* cus-edit.el (custom-mode-map):
* epa.el (epa-key-list-mode-map):
* man.el (Man-mode-map):
* startup.el (splash-screen-keymap):
* simple.el (special-mode-map): Use scroll-up-command and
scroll-down-command.
* progmodes/idlw-help.el (idlwave-help-mode-map):
* progmodes/ebrowse.el (ebrowse-electric-position-mode-map):
* net/newst-plainview.el (newsticker-mode-map):
* emulation/ws-mode.el (wordstar-mode-map):
* emulation/vi.el (vi-com-map):
* calc/calc-graph.el (calc-graph-show-dumb):
* term/sun.el (terminal-init-sun):
* term/ns-win.el (global-map):
* progmodes/grep.el (grep-mode-map):
* progmodes/ebrowse.el (ebrowse-electric-list-mode-map):
* mail/rmail.el (rmail-mode-map):
* progmodes/cpp.el (cpp-edit-mode-map): Likewise.
2011-10-01 16:32:01 -04:00
Glenn Morris
cc232200f7
* lisp/term/ns-win.el (ns-set-resource): Declare.
2011-06-29 19:54:16 -07:00
David Reitter
cd93b35930
ns-win: set ApplePressAndHoldEnabled to NO as it is unsupported.
...
This is in preparation for OS X "Lion"; it is a stop-gap solution
until this new input mechanism is supported correctly.
2011-06-21 11:45:36 -07:00
Chong Yidong
14beddf471
Merge changes from emacs-23 branch
2011-01-31 18:54:50 -05:00
Jan Djärv
ca9c274ae7
* term/ns-win.el (ns-find-file): Expand ns-input-file with
...
command-line-default-directory (Bug#7872).
NOTE: The trunk version is a bit different, I think there will be
merge conflicts.
2011-01-26 19:05:13 +01:00
Glenn Morris
95df8112a0
Refill some long/short copyright headers.
2011-01-26 00:36:39 -08:00
Glenn Morris
73b0cd5003
Convert consecutive FSF copyright years to ranges.
2011-01-24 20:08:28 -08:00
Stefan Monnier
77ab81d054
Merge from emacs-23
2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3
Add 2011 to FSF/AIST copyright years.
2011-01-02 15:50:46 -08:00
Jan Djärv
3e972d981f
Restore dock New Frame and Preferences menu functions (Bug#7535).
...
* term/common-win.el (x-setup-function-keys): Restore ns-new-frame
and ns-show-prefs.
* term/ns-win.el (global-map): Restore ns-new-frame and ns-show-prefs
bindings.
2010-12-03 12:48:24 +01:00
Jan Djärv
b7d1e14447
Add separate key mappings for left/right control/command on Nextstep (Bug#7458).
...
* lisp/cus-start.el (all): Add ns-right-control-modifier and
ns-right-command-modifier.
* lisp/term/ns-win.el (ns-right-control-modifier)
(ns-right-command-modifier): Defvar them.
* src/nsterm.m (ns_right_command_modifier, ns_right_control_modifier):
Define (Bug#7458).
(NSRightCommandKeyMask, NSRightControlKeyMask): Define (Bug#7458).
(EV_MODIFIERS): Check for NSRightCommandKeyMask and
NSRightControlKeyMask also (Bug#7458).
(keyDown): Ditto (Bug#7458).
(syms_of_nsterm): Defvar ns-right-command-modifier and
ns-right-control-modifier (Bug#7458).
2010-11-21 14:09:34 +01:00
Glenn Morris
b3edb781e0
Move ns-specific menu-bar code from term/ns-win.el to menu-bar.el.
...
* lisp/term/ns-win.el (global-map, menu-bar-final-items, menu-bar-help-menu):
Move menu-bar related settings to ../menu-bar.el.
* lisp/menu-bar.el (global-map, menu-bar-final-items, menu-bar-help-menu):
Move ns-specific settings here from term/ns-win.el.
2010-10-28 00:05:00 -07:00
Glenn Morris
c6efd3dd5d
* lisp/term/ns-win.el (ns-insert-file): Init in let.
...
(ns-find-file): Use let*.
2010-10-27 00:39:34 -07:00
Glenn Morris
1bcc463741
ns-win.el trivia.
...
* term/ns-win.el: (ns-handle-nxopen): Optionally handle the temp-case.
(ns-handle-nxopentemp): Just call ns-handle-nxopen.
(ns-insert-file, ns-find-file): Use `pop'.
2010-10-26 23:48:04 -07:00
Glenn Morris
e925113b0c
* lisp/term/ns-win.el: Restore require of cl when compiling.
...
(menu-bar-final-items): Remove non-existent `windows' menu.
2010-10-26 20:48:28 -07:00
Adrian Robert
fc3eda0471
* term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to global map. * term/common-win.el (x-setup-function-keys): Remove most of the keymappings. Comment on the remaining ones.
2010-10-26 16:20:00 +03:00
Glenn Morris
ceb951014f
* lisp/term/ns-win.el (ns-ignore-2-arg): Remove unused function.
...
(Mistakenly committed the ChangeLog for this earlier.)
2010-10-25 23:48:17 -07:00
Glenn Morris
d7d8c62a57
Remove ns-handle-* functions that duplicate x-handle-*.
...
* lisp/term/ns-win.el (ns-version-string): Remove unused declaration.
(ns-invocation-args): Change to x-invocation-args.
(ns-handle-switch, ns-handle-numeric-switch, ns-handle-iconic)
(ns-handle-name-switch, ns-ignore-2-arg): Remove.
(ns-handle-nxopen, ns-handle-nxopentemp, ns-ignore-1-arg):
Use x-invocation-args instead of ns-invocation-args.
(ns-initialize-window-system, handle-args-function-alist):
Use x-handle-args instead of ns-handle-args.
* lisp/term/common-win.el (x-handle-args): Also handle nextstep arguments.
* lisp/startup.el (command-line-ns-option-alist): Replace
ns-handle-name-switch, ns-handle-switch, ns-handle-numeric-switch,
ns-handle-iconic with the x- equivalents.
2010-10-25 20:58:19 -07:00
Glenn Morris
725513b7d9
Let ns load common-win.
...
* lisp/term/common-win.el (x-select-enable-clipboard):
* lisp/term/pc-win.el (x-select-enable-clipboard): Doc fix.
* lisp/term/ns-win.el: No need to require cl when compiling.
(x-display-name, x-setup-function-keys, x-select-text, x-colors)
(xw-defined-colors): Use the common-win definitions.
(ns-alternatives-map): Make it an obsolete alias for x-alternatives-map.
(ns-handle-iconic): Make it an alias for x-handle-iconic.
* lisp/term/common-win.el (x-select-text, x-alternatives-map)
(x-setup-function-keys, x-colors, xw-defined-colors): Handle 'ns case.
* lisp/loadup.el [ns]: Load common-win.
2010-10-25 19:59:05 -07:00
Glenn Morris
6a5c21753e
Move ns-win.el's rather wacky menu adjustments to menu-bar.el.
...
* lisp/term/ns-win.el: Do not require easymenu.
(menu-bar-edit-menu) <copy, paste, paste-from-menu, separator-undo>:
<spell>: Move adjustments to menu-bar.el.
* lisp/menu-bar.el (menu-bar-edit-menu) <copy, paste, paste-from-menu>:
<separator-undo, spell>: Move ns-win's adjustments here.
* lisp/loadup.el [ns]: Do not load easymenu.
* src/Makefile.in (SOME_MACHINE_LISP): Remove easymenu.elc.
* lib-src/makefile.w32-in (OTHER_PLATFORM_SUPPORT): Remove easymenu.elc.
2010-10-24 17:48:26 -07:00
Glenn Morris
a44d921f06
Move some more shared x-, w32- things to common-win.
...
* term/ns-win.el (x-select-text): Doc fix.
* w32-fns.el (x-alternatives-map, x-setup-function-keys)
(x-select-text): Move to term/common-win.
* term/w32-win.el (xw-defined-colors): Move to common-win.
* term/x-win.el (xw-defined-colors, x-alternatives-map)
(x-setup-function-keys, x-select-text): Move to common-win.
* term/common-win.el (x-select-text, x-alternatives-map)
(x-setup-function-keys, xw-defined-colors): Merge x- and w32-
definitions here.
2010-10-24 15:04:45 -07:00
Glenn Morris
3193e969df
Make all copies of xw-defined-colors have identical docs.
...
* lisp/term/ns-win.el (xw-defined-colors):
* lisp/term/x-win.el (xw-defined-colors): Make docs identical to w32-win.
2010-10-23 13:43:59 -07:00
Juanma Barranquero
4c14013dbe
Merge changes from emacs-23 branch.
2010-10-12 01:57:49 +02:00
Jan Djärv
a2e35ef5d5
Bug#7150: Distinguishing between left and right Alt keys on NextStep/OSX.
...
* lisp/cus-start.el (all): ns-right-alternate-modifier is new.
* lisp/term/ns-win.el (ns-right-alternate-modifier): New defvar.
(ns-right-option-modifier): New alias for ns-right-alternate-modifier.
(mac-right-option-modifier): New alias for ns-right-option-modifier.
* src/nsterm.m (Qleft): Declare.
(ns_right_alternate_modifier): New variable
(NSRightAlternateKeyMask): New define.
(EV_MODIFIERS): Parse NSRightAlternateKeyMask if
ns_right_alternate_modifier isn't Qleft.
(keyDown): If ns_right_alternate_modifier isn't Qleft, use it
as emacs modifier for NSRightAlternateKeyMask.
(syms_of_nsterm): DEFVAR_LISP ns-right-alternate-modifier.
2010-10-11 21:18:08 +02:00
Jan Djärv
4524012543
Remove cut buffer from documentation.
...
* doc/emacs/frames.texi (Cut/Paste Other App): Remove vut-buffer text.
* doc/lispref/text.texi (Low-Level Kill Ring):
* doc/lispref/frames.texi (Window System Selections): Remove cut buffer
documentation.
* doc/misc/cl.texi (Basic Setf): Remove x-get-cut-buffer and x-get-cutbuffer.
* lisp/term/x-win.el (x-select-text):
* lisp/term/pc-win.el (x-selection-value):
* lisp/term/ns-win.el (x-selection-value):
* lisp/eshell/em-term.el:
* lisp/w32-fns.el (x-get-selection-value):
* lisp/mouse-sel.el (mouse-sel-set-selection-function):
* lisp/frame.el (display-selections-p): Remove cut-buffer in documentation.
* lisp/term.el (term-mouse-paste): Don't call x-get-cutbuffer.
Remove cut buffer from error message.
2010-09-02 12:17:02 +02:00
Jan Djärv
6d7cc56382
Removed cut-buffer code.
...
* lisp/mouse-sel.el (mouse-sel-get-selection-function):
x-cut-buffer-or-selection-value renamed to x-selection-value.
(x-select-text): Optional push removed.
* lisp/select.el (x-get-cut-buffer, x-set-cut-buffer): Remove.
* lisp/simple.el (interprogram-cut-function): Remove mention of PUSH.
* lisp/w32-fns.el (x-last-selected-text):
x-cut-buffer-or-selection-value renamed to x-selection-value.
(x-cut-buffer-max): Remove.
(x-select-text): Remove argument PUSH, update documentation.
* lisp/emacs-lisp/cl-macs.el (x-get-cutbuffer, x-get-cut-buffer): Remove.
* lisp/term/ns-win.el (x-setup-function-keys, ns-last-selected-text):
x-cut-buffer-or-selection-value renamed to x-selection-value
(x-selection-value): Renamed from x-cut-buffer-or-selection-value.
(x-select-text): Remove argument PUSH, update documentation.
* lisp/term/pc-win.el (x-last-selected-text):
x-cut-buffer-or-selection-value renamed to x-selection-value
(x-select-text): Remove argument PUSH, update documentation.
* lisp/term/x-win.el: Update documentation for x-last-selected-text-*.
(x-last-selected-text-cut, x-last-selected-text-cut-encoded)
(x-last-cut-buffer-coding, x-cut-buffer-max): Remove.
(x-select-text): Remove argument PUSH, update documentation. Remove
cut-buffer code.
(x-selection-value-internal): Was previously x-selection-value.
(x-selection-value): Renamed from x-cut-buffer-or-selection-value.
Update documentation, remove cut-buffer code. Call
x-selection-value-internal.
(x-clipboard-yank): Call x-selection-value-internal.
(x-initialize-window-system): Remove setting of x-cut-buffer-max.
* src/xselect.c: Remove declaration of cut-buffer objects and functions.
(symbol_to_x_atom): Remove mapping to XA_CUT_BUFFERn.
(x_atom_to_symbol): Remove mapping to QCUT_BUFFERn.
(Fx_get_cut_buffer_internal, Fx_store_cut_buffer_internal)
(Fx_rotate_cut_buffers_internal): Remove.
(syms_of_xselect): Remove defsubr of above.
Remove intern of QCUT_BUFFERn.
* src/xterm.c (x_term_init): Don't set dpyinfo->cut_buffers_initialized.
* src/xterm.h (struct dpyinfo): Remove cut_buffers_initialized.
2010-09-02 11:47:08 +02:00
Jan D
64cb6c7883
Use CLIPBOARD and PRIMARY on NS (Bug#6677).
...
* lisp/term/ns-win.el (ns-get-pasteboard, ns-set-pasteboard): Use
QCLIPBOARD instead of QPRIMARY (Bug#6677).
* src/nsselect.m (QCLIPBOARD, NXPrimaryPboard): Define.
(symbol_to_nsstring): Map QCLIPBOARD => NSGeneralPboard,
QPRIMARY => NXPrimaryPboard.
(ns_string_to_symbol): NSGeneralPboard => QCLIPBOARD,
NXPrimaryPboard => QPRIMARY.
(nxatoms_of_nsselect): NXPrimaryPboard = PrimarySelection,
NXSecondaryPboard = SecondarySelection.
(syms_of_nsselect): Intern QCLIPBOARD (Bug#6677).
2010-08-18 08:16:55 +02:00
Adrian Robert
79cb9c05a1
term/ns-win.el: Bind M-~ to 'ns-prev-frame (due to Matthew Dempsky; bug#5084). Remove incorrect binding for S-tab. (ns-alternatives-map): Change S-tab binding to backtab (bug#6616). * simple.el (normal-erase-is-backspace-setup-frame): Set mode on under ns.
2010-07-13 13:41:49 +03:00
Glenn Morris
114f9c9679
Add 2010 to copyright years.
2010-01-13 00:35:10 -08:00
Stefan Monnier
937e6a5612
* url-util.el (url-insert-entities-in-string):
...
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
Juanma Barranquero
32226619c5
Use called-interactively-p' instead of interactive-p'.
2009-10-02 03:48:36 +00:00
Adrian Robert
aa36cda6de
Don't set the region face background.
2009-09-27 16:06:04 +00:00
Glenn Morris
6125167ce2
(ns-reg-to-script): Define for compiler.
2009-09-24 03:22:40 +00:00
Adrian Robert
a3b4b36385
* term/nswin.el (ns-reg-to-script): New variable.
2009-09-23 02:35:33 +00:00
Stefan Monnier
31cd2dd4e1
* simple.el: Add mapping for backspace/delete/clear/tab/escape/return
...
to function-key-map, and give them ascii-character property.
* term/x-win.el (x-alternatives-map):
* term/ns-win.el (ns-alternatives-map):
* term/internal.el (msdos-key-remapping-map):
* w32-fns.el (x-alternatives-map): Remove redundant mappings.
2009-09-14 01:22:42 +00:00
Stefan Monnier
9f94990d7e
* term/x-win.el (x-initialize-window-system):
...
* term/w32-win.el (w32-initialize-window-system):
* term/ns-win.el (ns-initialize-window-system): Don't call
mouse-wheel-mode since it's enabled globally by default already.
2009-09-12 19:04:24 +00:00
Glenn Morris
5cc443fe03
(x-display-name, x-setup-function-keys): Unify doc-strings with X versions.
2009-09-11 03:41:26 +00:00
Glenn Morris
5f68c1b736
Use forward-line rather than goto-line.
2009-09-01 03:18:44 +00:00
Glenn Morris
d93e053bb5
(ns-open-file-select-line): Use line-beginning-position rather than goto-line.
2009-08-21 07:31:10 +00:00
Eli Zaretskii
3077d1f623
Fix Bug#3888:
...
w32-vars.el (x-select-enable-clipboard): Doc fix.
term/pc-win.el (x-display-name, x-colors)
(x-select-enable-clipboard, x-select-text): Doc fix.
term/common-win.el (x-display-name, x-colors): Doc fix.
term/ns-win.el (x-select-text, x-setup-function-keys, x-colors)
(xw-defined-colors): Doc fix.
w32-fns.el (x-select-text, x-setup-function-keys)
(x-get-selection, x-set-selection): Doc fix.
term/x-win.el (x-select-text, x-setup-function-keys)
(x-select-enable-clipboard, xw-defined-colors): Doc fix.
select.el (x-set-selection): Doc fix.
2009-07-25 09:31:05 +00:00
YAMAMOTO Mitsuharu
7653ca1dfb
(ns-set-alpha): Don't declare.
...
(ns-set-background-alpha): Remove function.
2009-07-16 08:25:21 +00:00
Jan Djärv
285712468c
ns-win.el (x-select-font): defailias x-select-font to
...
ns-popup-font-panel instead of generate-fontset-menu.
2009-07-13 10:18:03 +00:00
Adrian Robert
c3c122b762
term/ns-win.el (composition-function-table) (script-representative-chars): Don't alter.
2009-06-08 04:35:40 +00:00
Juanma Barranquero
2b4e72e1d5
* term/ns-win.el (ns-alternatives-map, ns-insert-working-text)
...
(ns-echo-working-text, ns-utf8-nfd-post-read-conversion)
(ns-insert-text, ns-insert-file, ns-find-file, generate-fontset-menu)
(mouse-set-font, ns-respond-to-change-font, ns-standard-fontset-spec)
(ns-set-background-alpha, ns-set-foreground-at-mouse)
(ns-set-background-at-mouse): Fix typos in docstrings.
2009-05-03 23:19:35 +00:00