1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 03:40:56 -08:00
Commit graph

552 commits

Author SHA1 Message Date
Juri Linkov
4bf9880004 (cua-paste): Use `mouse-region-match' instead of checking last-command. 2007-08-21 20:05:14 +00:00
Michael Kifer
69441214fa 2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
* viper.el (viper-remove-hooks): remove some additional viper hooks
	when the user calls viper-go-away.
	(viper-go-away): restore the default of default-major-mode.
	Save the value of default-major-mode before vaperization.

	* viper-cmd.el: Replace error "" with "Viper bell".

	* viper-ex.el: Replace error "" with "Viper bell".

	* ediff-util.el (ediff-make-temp-file): use the coding system of the
	buffer for which file is created.
2007-08-19 13:47:08 +00:00
Glenn Morris
05d61686c6 Move CUA-mode check to `bad-packages-alist'. 2007-08-14 08:41:06 +00:00
Stefan Monnier
cdf4e301b0 Add tpu-extras's autoloads.
(tpu-gold-map, tpu-global-map): Comment-out the bindings to nil.
(tpu-gold-map): Bind F to tpu-cursor-free-mode.
(minibuffer-local-map): Use funkey symbols rather than esc-sequence.
2007-08-14 00:58:28 +00:00
Stefan Monnier
944a8b1d86 Remove spurious * in docstrings.
Put its autoloads into tpu-edt.el rather than loaddefs.el.
(tpu-cursor-free-mode): Rename from tpu-cursor-free.
Make into a proper minor-mode.
(tpu-backward-char, tpu-next-line, tpu-previous-line)
(tpu-next-end-of-line, tpu-current-end-of-line): Use new name.
(tpu-trim-line-ends-if-needed): Rename from tpu-before-save-hook.
(tpu-set-cursor-free, tpu-set-cursor-bound):
Delegate to tpu-cursor-free-mode.
(tpu-next-line, tpu-previous-line, tpu-forward-line)
(tpu-backward-line, tpu-scroll-window-down, tpu-scroll-window-up):
Use line-move or forward-line instead of next-line-internal.
2007-08-14 00:51:09 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Richard M. Stallman
c0d8c0a4c5 (vi-next-line): Ignore return value of line-move. 2007-08-12 18:05:08 +00:00
Stefan Monnier
036f2966c3 (tpu-current-line): Use posn-at-point and count-screen-lines.
(tpu-edt-off): Disable relevant pieces of advice.
2007-08-06 16:21:33 +00:00
Stefan Monnier
f2b189796c (tpu-before-save-hook): Rename from tpu-write-file-hook.
Activate it with add-hook on buffer-save-hook.
(newline, newline-and-indent, do-auto-fill): Use advice instead of
redefining the function.
(tpu-set-scroll-margins): Activate the pieces of advice.
2007-08-06 16:20:10 +00:00
Miles Bader
0896d93184 Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 84-87)

   - Update from CVS
   - Change capitalization of VC backend names for new backends

2007-08-02  Richard M. Stallman  <rms@gnu.org>

   * lisp/mail/rmailsum.el (rmail-make-summary-line): Find end of msg number
   to update deleted flag.

   * lisp/cus-edit.el (customize-apropos, customize-apropos-options)
   (customize-apropos-faces, customize-apropos-groups): Improve prompt.

   * lisp/menu-bar.el (menu-bar-help-menu): Add "About GNU" menu item.

   * lisp/startup.el (fancy-splash-head, startup-echo-area-message):
   Change message text.

   * lisp/emulation/tpu-edt.el (next-line-internal): Setting deleted.
   All callers use line-move.

   * lisp/progmodes/compile.el (compilation-find-buffer): Return current
   buffer immediately if suitable.
   (compile, compilation-buffer-name, compilation-start): Doc fixes.

2007-07-31  Daiki Ueno  <ueno@unixuser.org>

   * lisp/faces.el (face-normalize-spec): New function.
   (frame-set-background-mode): Normalize face-spec before calling
   face-spec-match-p.

2007-07-31  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/server.el (server-window): Add switch-to-buffer-other-frame option.

2007-08-03  Richard M. Stallman  <rms@gnu.org>

   * src/fileio.c (Fvisited_file_modtime): Use make_time.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-844
2007-08-03 05:49:59 +00:00
Richard M. Stallman
77b4381a2d (next-line-internal): Setting deleted. All callers use line-move. 2007-08-02 17:43:00 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
Kim F. Storm
53c11b7e04 (cua--pre-command-handler-1): Rewrite. 2006-09-05 20:54:16 +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
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
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
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
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
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