mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-14 01:50:22 -08:00
Code Issues Projects Releases Wiki Activity
74330 commits 241 branches 194 tags 7.7 GiB
Commit graph

605 commits

Author SHA1 Message Date
Miles Bader
e468b87f91 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 824-831)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 70-74)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
 2007-07-27 10:52:18 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22 
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
 2007-07-26 05:28:10 +00:00
Glenn Morris
e0085d62fa Switch license to GPLv3 or later. 2007-07-25 04:14:29 +00:00
Miles Bader
4dacf5c598 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 814-815)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-232
 2007-07-18 22:15:15 +00:00
Juri Linkov
0aeeaa263e (cua-paste): Before a yank command, 
check also whether last-command is one of mouse-save-then-kill,
mouse-secondary-save-then-kill, mouse-set-region, mouse-drag-region.
 2007-07-15 19:58:18 +00:00
Miles Bader
b361539260 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 793-802)

   - Update from CVS
   - Remove RCS keywords
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 42-50)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Gnus ChangeLog tweaks

 * gnus--rel--5.10  (patch 229-232)

   - Merge from emacs--devo--0, emacs--rel--22
   - ChangeLog tweak
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-223
 2007-06-16 22:32:13 +00:00
Michael Kifer
0ce61b6f9b 2007-06-14 Michael Kifer <kifer@cs.stonybrook.edu> 
* viper.el (viper-describe-key-ad, viper-describe-key-briefly-ad):
	different advices for Emacs and XEmacs. Compile them conditionally.
	(viper-version): belated version change.
 2007-06-14 18:10:46 +00:00
Michael Kifer
ac64a7284e 2007-06-12 Michael Kifer <kifer@cs.stonybrook.edu> 
* viper-cmd.el (viper-prefix-arg-com,viper-prefix-arg-value): display
	error messages
	(viper-prev-destructive-command,viper-insert-prev-from-insertion-ring):
	get rid of cl.el dependencies.

	* viper-init.el (viper-suppress-input-method-change-message): new
	variable.
	(viper-activate-input-method-action,viper-inactivate-input-method-action):
	use viper-suppress-input-method-change-message.

	* viper-kem.el (viper-vi-basic-map): disable the bindings for C-s, C-r.

	* viper-util.el (viper-set-cursor-color-according-to-state): use
	viper-replace-overlay-cursor-color instead of
	viper-replace-overlay-cursor-color.
	(viper-sit-for-short): use sit-for with 3 arguments.

	* viper.el (viper-insert-state-mode-list): add gud-mode.
	(viper-major-mode-modifier-list): add viper-comint-mode-modifier-map to
	gud-mode.

	* ediff-mult.el
	(ediff-meta-buffer-brief-message,ediff-meta-buffer-verbose-message):
	new variables.
	(ediff-meta-buffer-message): variable deleted.
	(ediff-verbose-help-enabled): new variable.
	(ediff-toggle-verbose-help-meta-buffer): new function.
	(ediff-redraw-directory-group-buffer): made aware of short/verbose
	message options

	* ediff-ptch.el (ediff-context-diff-label-regexp): better regexp.
	(ediff-fixup-patch-map): improved heuristic.
 2007-06-12 19:20:25 +00:00
Stefan Monnier
c8791c6a50 (tpu-emacs-map-key): Use new keymap names. 2007-06-12 04:56:35 +00:00
Stefan Monnier
86dd4d035f (tpu-gold-map): Rename from GOLD-map. 
(tpu-lucid-emacs-p): Remove.  Use (featurep 'xemacs) instead.
(CSI-map, GOLD-CSI-map, GOLD-SS3-map, SS3-map):	Delete vars.
(tpu-gold-map, tpu-global-map): Add all the SS3 and CSI bindings, using
keysyms rather than byte sequences.
(tpu-copy-keyfile): Don't force the user to use tpu-mapper.el.
 2007-06-12 04:55:40 +00:00
Miles Bader
262be72a9a Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 751-770)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change.
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (patch 18-25)
 * gnus--rel--5.10  (patch 222-223)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-208
 2007-05-24 21:31:10 +00:00
Richard M. Stallman
ce8fd9f3cb (CSI-map, SS3-map) Moved from global-map to tpu-global-map. 
(tpu-original-global-map) Variable deleted.
(tpu-control-keys-map) New keymap variable.
(tpu-set-control-keys) Use tpu-reset-control-keys rather than
setting keymapping directly.
(tpu-reset-control-keys) Use tpu-control-keys-map instead of tpu-global-map.
(tpu-edt-on): Activate the tpu-global-map.
(tpu-edt-off): Deactivate the tpu-global-map.
 2007-05-18 22:31:25 +00:00
Miles Bader
57cb2e6f26 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 675-697)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Release ERC 5.2.

 * gnus--rel--5.10  (patch 211-215)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
 2007-04-11 00:17:47 +00:00
Chong Yidong
ba5b5659a6 (viper-non-hook-settings): Handle mouse clicks in describe-key and 
describe-key-briefly advice a little better.
 2007-03-21 16:18:25 +00:00
Miles Bader
a73d7753f9 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 638-652)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177
 2007-02-26 23:03:45 +00:00
Kim F. Storm
ed8bc9f8e4 (cua-paste): Handle x-clipboard-yank. 
(cua--init-keymaps): Remap x-clipboard-yank to cua-paste.
 2007-02-24 21:52:43 +00:00
Miles Bader
bb5b9e9dbe Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 615-621)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 197-199)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166
 2007-01-30 22:22:43 +00:00
Kim F. Storm
5c4a605238 (cua-global-keymap, cua--region-keymap): 
Declare earlier to avoid byte compiler warnings.
 2007-01-28 22:34:31 +00:00
Glenn Morris
61c4714ee7 (viper-mode): Fix info ref in doc string. 2007-01-27 23:18:37 +00:00
Miles Bader
c0466914ba Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
 2007-01-26 06:16:11 +00:00
Michael Kifer
279c800c55 2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu> 
* ediff-util.el (ediff-clone-buffer-for-region-comparison): change text
	of message. Activate mark.
	(ediff-activate-mark): set transient-mark-mode to t.

	* ediff.el (ediff-regions-wordwise,ediff-regions-linewise): changed
	docstrings.

	* viper-keym.el (viper-insert-basic-map): deleted binding for S-TAB.
 2007-01-23 20:56:57 +00:00
Glenn Morris
f0fa15c5e5 Add 2007 to copyright years. 2007-01-21 02:48:43 +00:00
Juanma Barranquero
7cb0c23ba4 (keypad-setup): Fix typos in docstring. 2007-01-14 03:18:11 +00:00
Juanma Barranquero
33c053f464 (viper-custom-file-name, viper-mode): Fix typos in docstrings. 2007-01-02 23:57:14 +00:00
Miles Bader
4c34eeeee5 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 563-582)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 177-185)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
 2007-01-01 03:21:06 +00:00
Michael Kifer
c6a85d16a5 2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu> 
* ediff-diff.el (ediff-diff-options): clarify docstring.
	(ediff-setup-diff-regions): disallow -u in ediff-diff-options.

	* viper-cmd.el (viper-post-command-sentinel): protect against errors in
	hooks.
	(viper-add-newline-at-eob-if-necessary): add newline only if we
	actually modify buffer; ignore errors if occur.
 2006-12-23 21:33:50 +00:00
Miles Bader
4bc5d7668e Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 545-562)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - erc-iswitchb: Temporarily enable iswitchb mode

 * gnus--rel--5.10  (patch 172-176)

   - Merge from emacs--devo--0
   - Update from CVS
   - Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
 2006-12-16 01:29:26 +00:00
Eli Zaretskii
6687ffc7be Replace /' with a -', to fix a problem on Cygwin. 2006-12-15 16:24:04 +00:00
Eli Zaretskii
8830e9daae Update maintainer's email address. 2006-12-15 16:09:17 +00:00
Juanma Barranquero
a3c0e1884e (vi-char-argument): Doc fix. 2006-12-10 23:49:36 +00:00
Glenn Morris
d59c31376c Update copyright years. 2006-12-07 05:06:17 +00:00
Miles Bader
a0451a715e Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 523-544)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 168-171)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150
 2006-12-07 04:14:14 +00:00
Kim F. Storm
fc36357836 (cua-paste-pop-rotate-temporarily): Doc fix. 
(cua-paste-pop): Rework last change for cua-paste-pop-rotate-temporarily,
so first M-y and C-y works alike, pasting the head of the kill-ring, and
prefix arg C-u M-y inserts the text inserted by the last M-y command.
 2006-12-05 22:35:30 +00:00
Kim F. Storm
c64a6023b9 (cua-toggle-set-mark): Doc fix. 
(cua-repeat-replace-region): Make M-v more robust.
(cua-paste-pop-rotate-temporarily): New defcustom.
(cua-paste-pop): Use it.
(cua-auto-mark-last-change): New defcustom.
(cua-pop-to-last-change): New helper function.
(cua-set-mark): Use them.
 2006-12-02 00:30:00 +00:00
Miles Bader
dbc3b08c40 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 490-504)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 161-163)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130
 2006-11-07 23:22:48 +00:00
Juanma Barranquero
a3c473b2cf Fix typo in interactive message. 2006-11-06 02:35:03 +00:00
Juanma Barranquero
e208bb1b12 (tpu-help-text, tpu-save-all-buffers-kill-emacs, tpu-emacs-replace, 
tpu-reset-control-keys): Fix typos in docstrings.
 2006-11-06 02:34:27 +00:00
Juanma Barranquero
49c8765481 (vip-emacs-local-map, vip-change-mode-to-emacs): Fix typo in docstring. 2006-11-06 02:33:15 +00:00
Juanma Barranquero
a6fb441a19 (viper-emacs-state-cursor-color): Fix typo in docstring. 2006-11-06 02:32:30 +00:00
Juanma Barranquero
bb3a923456 (viper-emacs-kbd-map, viper-toggle-key): Fix typos in docstrings. 2006-11-06 02:31:52 +00:00
Juanma Barranquero
cbd9191d3c (viper-mode, viper-set-hooks, viper-major-mode-modifier-list): 
Fix typos in docstrings.
 2006-11-06 02:31:07 +00:00
Miles Bader
503be82149 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 476-489)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 153-160)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127
 2006-10-30 08:54:41 +00:00
Michael Kifer
7eb605c752 2006-10-23 Michael Kifer <kifer@cs.stonybrook.edu> 
* viper-cmd.el (viper-prefix-arg-com): define gg as G0

	* viper-ex.el (ex-read): quote file argument.

	* ediff-diff.el (ediff-same-file-contents): expand file names.

	* ediff-mult.el (ediff-append-custom-diff): quote shell file arguments.
 2006-10-23 19:20:15 +00:00
Miles Bader
465384748f Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 437-446)

   - Update from CVS
   - lisp/url/url-methods.el: Fix format error when http_proxy is empty string
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 137-140)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111
 2006-09-20 06:04:23 +00:00
Michael Kifer
f573c8b035 * viper.el: Bumped up version/date of update to reflect the substantial 
changes done in August 2006.

	* viper-cmd (viper-next-line-at-bol): make sure button-at, push-button
	are defined.

	* ediff-util.el (ediff-add-to-history): new function.

	* ediff.el: use ediff-add-to-history instead of add-to-history.
 2006-09-18 19:22:31 +00:00
Miles Bader
fae22cbf7f Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 423-426)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 131-133)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-109
 2006-09-06 07:30:39 +00:00
Kim F. Storm
53c11b7e04 (cua--pre-command-handler-1): Rewrite. 2006-09-05 20:54:16 +00:00
Miles Bader
af6ea8ad8d Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 414-422)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 128-130)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108
 2006-09-05 02:54:22 +00:00
Michael Kifer
05c4a38a25 2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu> 
* viper-cmd.el (viper-special-read-and-insert-char): convert events to
	chars if XEmacs.
	(viper-after-change-undo-hook): check if undo-in-progress is bound.
 2006-08-31 03:39:42 +00:00
Miles Bader
d65dc2c390 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 399-413)

   - Update from CVS
   - Rcirc update from Ryan Yeske
   - Merge from gnus--rel--5.10
   - Miscellaneous tq-related fixes.

 * gnus--rel--5.10  (patch 126-127)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-105
 2006-08-28 04:33:45 +00:00