mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity
98349 commits 242 branches 194 tags 7.7 GiB
Commit graph

1054 commits

Author SHA1 Message Date
Glenn Morris
8d7b5b5ba9 * lisp/term/w32-win.el (libpng-version): Declare for compiler. 2011-02-02 23:31:42 -08:00
Sam Steingold
e8e4d5c88e undo 2011-02-01T18:15:18Z!sds@gnu.org (purecopy-cons, purecopy-car) at Stefan Monnier's request 2011-02-01 16:37:12 -05:00
Sam Steingold
0b75349e7e * lisp/subr.el (purecopy-cons, purecopy-car): Add shortcuts. 
* lisp/faces.el (face-x-resources): Use `purecopy-cons'.
* lisp/files.el (auto-mode-alist, interpreter-mode-alist): Use
`purecopy-car'.
* lisp/international/fontset.el (font-encoding-alist): Ditto.
* lisp/international/mule-conf.el (file-coding-system-alist): Ditto.
* lisp/international/mule.el (auto-coding-alist)
(auto-coding-regexp-alist): Ditto.
* lisp/mouse.el (mouse-buffer-menu-mode-groups): Use `purecopy-cons'.
* lisp/term/x-win.el (x-gtk-stock-map): Ditto.
 2011-02-01 13:15:18 -05: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
Glenn Morris
e9bffc61f2 Refill some copyright headers. 2011-01-15 18:21:30 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -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
Chong Yidong
7c420169ba Merge changes from emacs-23 branch 2011-01-02 15:31:19 -05:00
Eli Zaretskii
5be1c984b7 Fix bug #7716 with PNG image support libraries on Windows. 
src/image.c <Qlibpng_version>: New variable.
 (syms_of_image): Intern and staticpro it.  Set its value to the
 version of PNG library we were compiled with.
 (my_png_error, png_load): Avoid GCC warnings about direct access
 to png_ptr->jmpbuf.
 lisp/term/w32-win.el (image-library-alist): Set up correctly for
 libpng versions both before and after 1.4.0.
 admin/nt/README.W32: Update the information about PNG support libraries.
 nt/INSTALL: Update the information about PNG support libraries.
 2010-12-31 14:38:06 +02: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
Eli Zaretskii
a2249e66f3 term/pc-win.el (x-get-selection-internal): Emulation for MS-DOS. 2010-11-26 20:38:40 +02: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
c8ccffb13c Fix some declarations. 
* lisp/gnus/nnimap.el (gnutls-negotiate):
* lisp/gnus/nntp.el (netrc-parse): Fix declarations.

* lisp/faces.el (xw-defined-colors, x-setup-function-keys):
* lisp/mouse-sel.el (x-select-text):
* lisp/term/w32console.el (x-setup-function-keys): Update declarations.
 2010-10-31 23:13:43 -07:00
Jan Djärv
04e6379658 Don't use STRING as first choice when pasting PRIMARY (Bug#6802). 
* lisp/term/x-win.el (x-get-selection-value): New function that gets
PRIMARY with type as specified in x-select-request-type. (Bug#6802).
 2010-10-31 17:03:11 +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
Glenn Morris
b94a5a43d1 * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case. 2010-10-26 09:56:11 -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
59ba9d59dc Simplifications for lisp/term/common-win.el 
* lisp/term/common-win.el (x-handle-switch): Simplify with pop.
Optionally handle numeric switches.
(x-handle-numeric-switch): Just call x-handle-switch.
(x-handle-initial-switch, x-handle-xrm-switch, x-handle-geometry)
(x-handle-name-switch, x-handle-display, x-handle-args):
Simplify with pop.
 2010-10-24 22:39:21 -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
8aa0f26343 Reduce duplicate definitions of x-select-enable-clipboard from 3 to 2. 
* lisp/w32-vars.el (x-select-enable-clipboard):
* lisp/term/x-win.el (x-select-enable-clipboard): Move to common-win.
* lisp/term/common-win.el (x-select-enable-clipboard): Move here.
 2010-10-23 18:57:21 -07:00
Glenn Morris
46710489c8 Remove duplicate definition of tty-defined-color-alist. 
* src/xfaces.c (syms_of_xfaces) <tty-defined-color-alist>: Sync doc with
Lisp version.
* lisp/term/tty-colors.el (tty-defined-color-alist): Remove duplicate
definition of C variable.
 2010-10-23 18:48:39 -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
Glenn Morris
6f748f70b6 Make all 3 copies of x-select-enable-clipboard have the same doc. 
* lisp/term/pc-win.el (x-select-enable-clipboard):
* lisp/term/x-win.el (x-select-enable-clipboard):
* lisp/w32-vars.el (x-select-enable-clipboard): Make doc-strings identical.
 2010-10-23 13:40:46 -07:00
Juanma Barranquero
2e288d54f0 Rename image-library-alist' to dynamic-library-alist'. 
* etc/NEWS: Mention `dynamic-library-alist'.

* lisp/image.el (image-library-alist): Declare as obsolete alias.
  (image-type-available-p): Use `dynamic-library-alist'.

* lisp/term/w32-win.el (dynamic-library-alist):
  Use instead of `image-library-alist'.

* nt/INSTALL: Refer to `dynamic-library-alist'.

* src/image.c (Vimage_library_alist)
  (syms_of_image) <image-library-alist>: Move to src/emacs.c and rename.
  (lookup_image_type): Use Vdynamic_library_alist.
  (Finit_image_library): Doc fix.

* src/emacs.c (Vdynamic_library_alist)
  (syms_of_emacs) <dynamic-library-alist>: Move from src/image.c and rename.
  Doc fix.

* src/lisp.h (Vdynamic_library_alist): Declare extern.
 2010-10-13 16:50:06 +02: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
Glenn Morris
3226d6cacf Remove some functions, variables and aliases obsolete since at least 21.1. 
* doc/misc/misc.texi (Shell Mode): Remove reference to old function name.

* src/character.c (Fchar_bytes): Remove obsolete function.
(syms_of_character): Remove Schar_bytes.
* lisp/subr.el (char-bytes): Remove obsolete function.

* lisp/emacs-lisp/checkdoc.el (checkdoc-minor-keymap): Remove obsolete alias.

* lisp/isearch.el (isearch-return-char): Remove obsolete function.

* lisp/mouse.el: No longer provide mldrag.
(mldrag-drag-mode-line, mldrag-drag-vertical-line):
Remove obsolete aliases.

* lisp/comint.el (comint-kill-output): Remove obsolete alias.

* lisp/shell.el: Comment fix.

* lisp/composite.el (decompose-composite-char): Remove obsolete function.
* lisp/ps-def.el (decompose-composite-char): Remove unused function.

* lisp/iswitchb.el (iswitchb-default-keybindings): Remove obsolete function.

* lisp/outline.el (outline-visible): Remove obsolete function.

* lisp/term/pc-win.el (x-frob-font-slant, x-frob-font-weight):
* lisp/faces.el (internal-find-face, internal-get-face)
(frame-update-faces, frame-update-face-colors)
(x-frob-font-weight, x-frob-font-slant)
(internal-frob-font-weight, internal-frob-font-slant)
(x-make-font-bold, x-make-font-demibold, x-make-font-unbold)
(x-make-font-italic, x-make-font-oblique, x-make-font-unitalic)
(x-make-font-bold-italic): Remove functions and aliases, obsolete
since Emacs 21.1.
* lisp/emulation/viper-util.el (viper-get-face):
* lisp/obsolete/lucid.el (find-face, get-face): Use facep.
* lisp/vc/ediff-init.el (ediff-valid-color-p, ediff-get-face):
Remove unused functions.
* lisp/vc/ediff-util.el (ediff-submit-report): Doc fix.

* etc/NEWS: Mention above changes.
 2010-10-01 19:46:13 -07:00
Chong Yidong
117c96c769 Define obsolete alias x-cut-buffer-or-selection-value. 
* term/x-win.el (x-cut-buffer-or-selection-value): Define as
obsolete alias for x-selection-value.
 2010-09-16 18:47:21 -04: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
Chong Yidong
1604140125 Adapt mouse-3 behavior to recent selection changes (Bug#6701). 
* lisp/mouse.el (mouse-save-then-kill): Doc fix.  Deactivate mark
before killing to preserve the primary selection.

* lisp/term/x-win.el (x-select-text): Doc fix.

* src/xselect.c (x_own_selection): Use list4.
 2010-07-31 17:26:56 -04:00
Lawrence Mitchell
47d2734f62 * term/vt100.el (vt100-wide-mode): Fix :init-value keyword (bug#6620). 2010-07-22 13:09:52 +02:00
Chong Yidong
2490cbbcb7 Change x-select-enable-primary to nil. 
* lisp/mouse.el (mouse-drag-copy-region):
* lisp/simple.el (select-active-regions): Likewise.

* lisp/term/x-win.el (x-select-enable-primary): Change default to nil.
(x-select-enable-clipboard): Add :version keyword.
 2010-07-16 22:49:48 -04:00
Chong Yidong
f9d71b4284 Change clipboard/primary selection to X application standards. 
* lisp/menu-bar.el (menu-bar-enable-clipboard): Don't overwrite
Cut/Copy/Paste menu bar items.

* lisp/mouse.el: Bind mouse-2 to mouse-yank-primary.
(mouse-drag-copy-region): Default to nil.

* lisp/simple.el (select-active-regions): Default to t.
(push-mark-command): Don't overwrite primary with empty string.

* lisp/term/x-win.el (x-select-enable-clipboard): Default to t.
(x-initialize-window-system): Don't overwrite Paste menu item.
 2010-07-14 14:03:39 -04: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
Chong Yidong
89877f5f3c Add all rgb.txt color names to x-colors. 
* facemenu.el (list-colors-print): Don't print extra names if it
will overflow the window width.

* term/common-win.el (x-colors): Add all the color names defined
in rgb.txt (Bug#6332).
 2010-06-12 13:12:15 -04:00
Andreas Schwab
639b2760f1 Merge from emacs-23 2010-06-10 00:08:50 +02:00
Chong Yidong
86253dc05d * term/common-win.el (x-colors): Add "dark green" and "dark turquoise" (Bug#6332). 2010-06-04 12:15:51 -04:00