1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-09 08:21:30 -07:00
Commit graph

562 commits

Author SHA1 Message Date
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
Michael Kifer
83f49acbc0 2006-08-25 Michael Kifer <kifer@cs.stonybrook.edu>
* viper.el (viper-set-hooks): use frame bindings for
	viper-vi-state-cursor-color.
	(viper-non-hook-settings): don't set default
	mode-line-buffer-identification.

	* viper-util.el (viper-set-cursor-color-according-to-state): new
	function.
	(viper-set-cursor-color-according-to-state,
	viper-get-saved-cursor-color-in-replace-mode,
	viper-get-saved-cursor-color-in-insert-mode): make conditional on
	viper-emacs-state-cursor-color.

	* viper-cmd.el (viper-envelop-ESC-key): bug fix.
	(viper-undo): use point if undo-beg-posn is nil.
	(viper-insert-state-post-command-sentinel,viper-change-state-to-emacs,
	viper-after-change-undo-hook): don't use
	viper-emacs-state-cursor-color by default.
	(viper-undo): more sensible positioning after undo.

	* viper-ex.el (ex-splice-args-in-1-letr-cmd): got rid of caddr.
	(viper-emacs-state-cursor-color): default to nil, since this feature
	doesn't work well yet.

	* ediff-mult.el (ediff-intersect-directories,
	ediff-get-directory-files-under-revision, ediff-dir-diff-copy-file):
	always expand filenames.
2006-08-25 16:06:57 +00:00
Miles Bader
63db3c1b3f Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 343-356)

   - Update from CVS
   - Update for ERC 5.1.3.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 113-115)

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

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90
2006-07-19 00:42:56 +00:00
Kim F. Storm
a452073597 (cua-help-for-rectangle): Add `alt' modifier. 2006-07-14 22:14:17 +00:00
Kim F. Storm
ae6ffe9997 (cua-delete-selection, cua-toggle-set-mark): New defcustoms.
(cua-rectangle-modifier-key): Add `alt' modifier.
(cua-replace-region): Don't delete if cua-delete-selection is nil.
(cua-set-mark): Don't clear mark if cua-toggle-set-mark is nil.
Suggested by Klaus Zeitler <kzeitler@lucent.com>.
2006-07-14 22:14:08 +00:00
Miles Bader
6a46b01883 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 320-342)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - lisp/play/cookie1.el (cookie): Work properly when there's only one entry
   - Add note about "link" button-class to etc/TODO

 * gnus--rel--5.10  (patch 108-112)

   - Merge from emacs--devo--0
   - Clean up merge mistakes
   - Update from CVS
   - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
2006-07-06 08:59:39 +00:00
Chong Yidong
b99489fee1 * emulation/viper-init.el, calendar/calendar.el:
* progmodes/make-mode.el: Delete calls to facemenu-unlisted-faces.
2006-07-03 14:32:01 +00:00
Miles Bader
7ffefb0856 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 314-319)

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

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

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-78
2006-06-20 07:35:06 +00:00
Michael Kifer
ec6aebe833 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-special-read-and-insert-char): use
	read-key-sequence.
	(viper-after-change-undo-hook): enhancements.
	(viper-after-change-undo-hook): new hook.
	(viper-undo): use viper-after-change-undo-hook.
	(viper-add-newline-at-eob-if-necessary): widen before making changes.
	(viper-next-line-at-bol): If point is on a widget or a button, simulate
	clicking on that widget/button.

	* viper.el (viper-mode): allow for a separate cursor color in Emacs
	state.

	* ediff-diff (ediff-test-patch-utility): catch errors.
	(ediff-actual-diff-options, ediff-actual-diff3-options): new variables.
	(ediff-set-actual-diff-options): new function.
	(ediff-reset-diff-options, ediff-toggle-ignore-case):
	use ediff-set-actual-diff-options.
	(ediff-extract-diffs): catch errors.
	(ediff-whitespace): add nonbreakable space.
	(ediff-same-file-contents): catch errors.

	* ediff-mult.el (ediff-collect-custom-diffs): save
	coding-system-for-read.

	* ediff-vers.el (ediff-keep-tmp-versions): new var.
	(ediff-vc-internal, ediff-vc-merge-internal): use
	ediff-delete-version-file.
	(ediff-delete-version-file): new function.

	* ediff-wind.el (ediff-control-frame-parameters): set frame fringes.

	* ediff.el (ediff-directories, ediff-directory-revisions,
	ediff-merge-directories, ediff-merge-directories-with-ancestor,
	ediff-directories-internal, ediff-merge-directory-revisions,
	ediff-merge-directory-revisions-with-ancestor,
	ediff-directories3): use read-directory-name.
2006-06-18 17:08:24 +00:00
Miles Bader
b883cdb2fe Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
2006-06-07 18:05:10 +00:00
Kim F. Storm
398d70ced0 Mention customizing cua-mode as alternative
way to enable built-in cua-mode if user loads older CUA-mode package.
2006-05-20 22:38:02 +00:00
Miles Bader
cfc2051d0e Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 204-225)

   - Update from CVS
   - Sync from erc--emacs--0
   - Merge from gnus--rel--5.10
   - Improve tq.el.
   - Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.

 * gnus--rel--5.10  (patch 81-85)

   - Update from CVS
   - Merge from emacs--devo--0
2006-04-17 08:41:12 +00:00
Kim F. Storm
a4dad45a78 (cua-copy-region-to-global-mark)
(cua-cut-region-to-global-mark): Use filter-buffer-substring.
2006-04-09 23:04:33 +00:00
Kim F. Storm
15ac4d5825 (cua--extract-rectangle)
(cua-incr-rectangle, cua--rectangle-aux-replace):
Use filter-buffer-substring.
2006-04-09 23:04:22 +00:00
Kim F. Storm
cf21140436 (cua-delete-region, cua-paste)
(cua-repeat-replace-region): Use filter-buffer-substring.
2006-04-09 23:04:07 +00:00
Miles Bader
1ef7e5599f Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 164-184)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: man/mh-e.texi (Folders): Various edits.
   - Update from erc--emacs--0

 * gnus--rel--5.10  (patch 62-70)

   - Merge from emacs--devo--0
   - Update from CVS
2006-03-28 23:08:20 +00:00
Kim F. Storm
27366995b7 (cua--init-rectangles): Use
cua-rectangle-mark-key instead of fixed C-return.
2006-03-25 00:55:09 +00:00
Kim F. Storm
1cb225da02 (cua-rectangle-mark-key): New defcustom.
(cua--init-keymaps): Use it instead of fixed C-return.
(cua-mode): Set after it.
2006-03-25 00:55:00 +00:00
Kim F. Storm
b53b41baa1 (cua--highlight-rectangle): Set overlay
cursor property value to 2 (to align with C level change).
2006-03-19 19:59:33 +00:00
Miles Bader
b434f199db Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-21
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 97-112)

   - Update from CVS
   - Merge from erc--emacs--0
   - Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo.
   - Merge from gnus--rel--5.10

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

   - Update from CVS
2006-02-22 06:54:10 +00:00
Michael Kifer
b6178721d8 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-insert-state-post-command-sentinel,
	viper-change-state-to-vi, viper-change-state-to-emacs):
	made aware of cursor coloring in the emacs state.
	(viper-special-read-and-insert-char): use read-char-exclusive.
	(viper-minibuffer-trim-tail): workaround for fields in minibuffer.

	* viper-init.el (viper-emacs-state-cursor-color): new variable.

	* viper-util.el (viper-save-cursor-color,
	viper-get-saved-cursor-color-in-replace-mode,
	viper-get-saved-cursor-color-in-insert-mode,
	viper-restore-cursor-color): make aware of the cursor color in emacs
	state.
	(viper-get-saved-cursor-color-in-emacs-mode): new function.

	* ediff-diff.el (ediff-ignore-case, ediff-ignore-case-option,
	ediff-ignore-case-option3, ediff-actual-diff-options,
	ediff-actual-diff3-options): new variables to control case sensitivity.
	(ediff-make-diff2-buffer, ediff-setup-fine-diff-regions,
	ediff-setup-diff-regions3): made aware of case-sensitivity.
	(ediff-toggle-ignore-case): new function.
	(ediff-extract-diffs, ediff-extract-diffs3): preserve point in buffers.

	* ediff-help.el (ediff-long-help-message-narrow2,
	ediff-long-help-message-compare2, ediff-long-help-message-compare3,
	ediff-long-help-message-word-mode): add ignore-case command.
	(ediff-help-for-quick-help): add ignore-case command.

	* ediff-merg.el: move provide to the end.

	* ediff-ptch.el: move provide to the end.

	* ediff-wind.el: move provide to the end.

	* ediff-mult.el: move provide to the end.
	(ediff-set-meta-overlay): enable follow-link.

	* ediff.el: move provide to the end.
	Break recursive load cycle in eval-when-compile.
	(ediff-patch-buffer): better heuristics.

	* ediff-util.el: move provide to the end.
	Break recursive load cycle in eval-when-compile.
	(ediff-setup-keymap): add binding for #c. Replaced some defsubsts with
	defuns.
	(ediff-submit-report): pass the values of ediff-diff3-program,
	ediff-diff3-options.
2006-02-19 03:16:45 +00:00
Miles Bader
380874900c Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

   - Update from CVS
   - Merge from emacs--devo--0
2006-02-08 04:26:44 +00:00
Thien-Thi Nguyen
ceb4c4d303 Update years in copyright notice; nfc. 2006-02-06 12:31:40 +00:00
Miles Bader
307f5c5746 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-11
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 34-42)

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

 * gnus--rel--5.10  (patch 14-17)

   - Update from CVS
   - Merge from emacs--devo--0
2006-02-04 01:01:38 +00:00
Luc Teirlinck
c36f1e6780 (cua-mode): Doc fix. 2006-02-02 14:41:36 +00:00
Kim F. Storm
2b3726c087 (cua-mode): Mention that CUA enables
transient-mark-mode in doc string.
2006-02-01 10:41:36 +00:00
Miles Bader
06eb776d8e Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-9
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 16-33)

   - Update from CVS
   - Install ERC.
   - Fix ERC compiler warnings.
   - Use utf-8 encoding in ERC ChangeLogs.
   - Merge ERC-related Viper hacks into Viper.
   - Merge from erc--main--0
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 8-13)

   - Merge from emacs--devo--0
   - Update from CVS
2006-02-01 10:07:17 +00:00
Miles Bader
98c414c7fd Revision: emacs@sv.gnu.org/emacs--devo--0--patch-27
Creator:  Michael Olson <mwolson@gnu.org>

Merge ERC-related Viper hacks into Viper.
2006-01-30 03:16:50 +00:00
Miles Bader
41882805d6 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 616-696)

   - Add lisp/mh-e/.arch-inventory
   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
   - lisp/gnus/ChangeLog: Remove duplicate entry

 * gnus--rel--5.10  (patch 147-181)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: lisp/mml.el (mml-preview): Doc fix.
   - Update from CVS: texi/message.texi: Fix default values.
   - Update from CVS: texi/gnus.texi (RSS): Addition.
2006-01-16 08:37:27 +00:00
Kim F. Storm
5592022932 (cua--extract-rectangle): Undo recent change re. \s in strings. 2005-12-09 09:10:10 +00:00
Kim F. Storm
e87aa62061 (cua--rectangle-aux-replace): Fix
indention of text on right side of replaced rectangle.
2005-12-08 22:52:50 +00:00
Kim F. Storm
1638bf546d * emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
(cua-rectangle-modifier-key): ... this.	 New defcustom.	 Can now
select either meta, hyper, or super modifier for rectangle commands.
(cua--rectangle-modifier-key): New defvar.
(cua--M/H-key): Use it.	 Remove special case for 'space.
(cua--init-keymaps): Initialize it from cua-rectangle-modifier-key
on X, to meta otherwise.  Always bind C-return to toggle
rectangle.  Pass ?\s instead of 'space to cua--M/H-key.

* emulation/cua-rect.el (cua-help-for-rectangle): Use
cua--rectangle-modifier-key.  Handle super modifier too.
(cua--init-rectangles): Always bind C-return to toggle rectangle.
Pass ?\s instead of 'space to cua--M/H-key and cua--rect-M/H-key.
2005-12-08 22:24:35 +00:00
Kim F. Storm
ea707ec6a0 (cua--extract-rectangle): Don't use \s in strings. 2005-12-08 20:56:35 +00:00
Kim F. Storm
186bccc366 (cua--select-keymaps): Enable repeat
keymap if cua--prefix-override-timer equals 'shift.
(cua--shift-control-prefix): New function; emulate "type prefix
key twice" functionality to handle shifted prefix key override.
(cua--shift-control-c-prefix, cua--shift-control-x-prefix): New
commands.
(cua--init-keymaps): Bind them to S-C-c and S-C-x.
2005-12-08 14:12:12 +00:00
Kim F. Storm
c0e4cc1987 (cua--rectangle-overlays): Make permanent-local.
(cua--rectangle-post-command): Cleanup overlays and deactivate mark
after revert-buffer (or anything else which kills all local variables).
2005-11-29 23:58:20 +00:00
Kim F. Storm
98faed9f39 (cua--highlight-rectangle): Preserve
existing face when partially highlighting a TAB in a rectangle.
2005-11-26 23:30:43 +00:00
Michael Kifer
0680ea10b4 2005-11-25 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-keym.el (viper-ESC-key): use different values in terminal and
	window modes.

	* viper.el (viper-emacs-state-mode-list): delete mail-mode, add
	jde-javadoc-checker-report-mode.
2005-11-25 07:18:07 +00:00
Michael Kifer
54b171c787 2005-11-15 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-utils (viper-non-word-characters-reformed-vi): quote `-' in
	string.

	* viper.el (viper-emacs-state-mode-list): Ensure that
	rcirc-mode buffers come up in Emacs state.
2005-11-15 18:44:30 +00:00
Romain Francoise
90066cb5e0 (viper-set-hooks): Quote forms passed to `eval-after-load' to avoid
evaluating their result.
2005-10-23 12:47:11 +00:00
Miles Bader
9fe76e1b25 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-91
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 581-597)

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

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

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - Update from CVS: texi/gnus.texi (RSS): Fix key description.
   - Update from CVS: texi/gnus.texi (Document Server Internals): Addition.
2005-10-15 00:26:05 +00:00
Romain Francoise
4fe3f29711 * ibuf-ext.el (ibuffer-do-shell-command-pipe)
(ibuffer-do-shell-command-pipe-replace)
(ibuffer-do-shell-command-file, ibuffer-do-eval)
(ibuffer-do-view-and-eval, ibuffer-do-rename-uniquely)
(ibuffer-do-revert, ibuffer-do-replace-regexp)
(ibuffer-do-query-replace, ibuffer-do-query-replace-regexp)
(ibuffer-do-print, ibuffer-filter-by-mode, ibuffer-filter-by-used-mode)
(ibuffer-filter-by-name, ibuffer-filter-by-filename)
(ibuffer-filter-by-size-gt, ibuffer-filter-by-size-lt)
(ibuffer-filter-by-content, ibuffer-filter-by-predicate
(ibuffer-do-sort-by-major-mode, ibuffer-do-sort-by-mode-name)
(ibuffer-do-sort-by-alphabetic, ibuffer-do-sort-by-size):
Autoload file sans suffix.

* emulation/cua-base.el (cua-toggle-global-mark): Likewise.
2005-10-07 12:43:57 +00:00
Miles Bader
00e18f33ad Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-88
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 569-579)

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

 * gnus--rel--5.10  (patch 129-132)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
2005-10-07 07:15:40 +00:00
Michael Kifer
e2de3a2945 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-merge.el (ediff-merge-region-is-non-clash): new defsubst.
	(ediff-merge-region-is-non-clash-to-skip): previouslu called
	ediff-merge-region-is-non-clash.

	* ediff-mult.el (ediff-append-custom-diff,ediff-meta-show-patch): use
	insert-buffer-substring.

	* ediff-ptch.el (ediff-fixup-patch-map): use better heuristics for
	selecting files to patch. Also bug fixes.

	* ediff-util.el (ediff-setup): bug fix.
	(ediff-next-difference): Never skip clashes that differ in white space
	only.

	* ediff-wind.el (ediff-setup-control-frame,ediff-destroy-control-frame):
	check the menubar feature.

	* viper-cmd.el (viper-normalize-minor-mode-map-alist,
	viper-refresh-mode-line): use make-local-variable to localize some vars
	instead of make-variable-buffer-local. Suggested by Stefan Monnier.

	* viper-init.el (viper-make-variable-buffer-local): delete alias.
	(viper-restore-cursor-type,viper-set-insert-cursor-type): use
	make-local-variable instead of make-variable-buffer-local. Suggested by
	Stefan Monnier.

	* viper.el (viper-mode): don't use viper-make-variable-buffer-local.
	(viper-comint-mode-hook): use make-local-variable on
	require-final-newline.
	(viper-non-hook-settings): don't use make-variable-buffer-local.
2005-10-06 00:09:49 +00:00
Miles Bader
c4e8cde8c6 Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-86
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 562-568)

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

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

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
2005-09-30 11:43:45 +00:00