emacs/lisp/emulation, branch xwidget Emacs is the extensible, customizable, self-documenting real-time display editor. * lisp/emulation/viper.el: A couple of docstring format tweaks 2015-02-05T16:05:07+00:00 Stefan Monnier 2015-02-05T16:05:07+00:00 10927c1a0f39d527d9ea1fc4605a0ef400bdff4a 






Update copyright year to 2015
2015-01-01T22:26:41+00:00

Paul Eggert

2015-01-01T22:26:41+00:00

7e09ef09a479731d01b1ca46e94ddadd73ac98e3

Run admin/update-copyright.





Run admin/update-copyright.







Merge branch 'emacs-24'.
2014-11-29T07:07:16+00:00

Paul Eggert

2014-11-29T06:55:31+00:00

0cce3623b169732a51f055a86fc926313b11a5ee












.gitignore cleanup.
2014-11-18T01:58:28+00:00

Paul Eggert

2014-11-18T01:56:49+00:00

342bc0e04b68d9c52503816bedaf67c9e77be8d2

* .gitignore: Merge contents of subsidiary files and organize the
result so as to avoid duplication.  Remove no-longer needed entries.
* admin/charsets/.gitignore, admin/unidata/.gitignore:
* doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
* leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
* lisp/calc/.gitignore, lisp/calendar/.gitignore:
* lisp/cedet/.gitignore, lisp/emulation/.gitignore:
* lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
* lisp/international/.gitignore, lisp/language/.gitignore:
* lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
* lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
* lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
* lisp/play/.gitignore, lisp/progmodes/.gitignore:
* lisp/term/.gitignore, lisp/textmodes/.gitignore:
* lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
Remove; no longer needed.





* .gitignore: Merge contents of subsidiary files and organize the
result so as to avoid duplication.  Remove no-longer needed entries.
* admin/charsets/.gitignore, admin/unidata/.gitignore:
* doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
* leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
* lisp/calc/.gitignore, lisp/calendar/.gitignore:
* lisp/cedet/.gitignore, lisp/emulation/.gitignore:
* lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
* lisp/international/.gitignore, lisp/language/.gitignore:
* lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
* lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
* lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
* lisp/play/.gitignore, lisp/progmodes/.gitignore:
* lisp/term/.gitignore, lisp/textmodes/.gitignore:
* lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
Remove; no longer needed.







Merge from emacs-24; up to 117687
2014-11-08T18:21:38+00:00

Glenn Morris

2014-11-08T18:21:38+00:00

416148257afedb97bbe6d732eea3a0c72473dab0












* lisp/emulation/cua-base.el (cua--select-keymaps): Use region-active-p.
2014-11-07T19:55:39+00:00

Stefan Monnier

2014-11-07T19:55:39+00:00

06ee88e490baa46bc81311f9ade8f01dfe858311

(cua-set-mark, cua--pre-command-handler-1,cua--post-command-handler-1):
* lisp/emulation/cua-gmrk.el (cua-cancel-global-mark): Same.

Fixes: debbugs:18952





(cua-set-mark, cua--pre-command-handler-1,cua--post-command-handler-1):
* lisp/emulation/cua-gmrk.el (cua-cancel-global-mark): Same.

Fixes: debbugs:18952







Merge from emacs-24; up to 117656
2014-11-01T18:05:30+00:00

Glenn Morris

2014-11-01T18:05:30+00:00

d5d8ca30e5f481a32414c42bcc3b5a042061ff07












* lisp/emulation/cua-base.el (cua-delete-region): Use delete-active-region.
2014-10-31T15:31:27+00:00

Stefan Monnier

2014-10-31T15:31:27+00:00

95af181d665ffe7f0361c3f468445ac8e4a7858e

(cua--last-deleted-region-pos, cua--last-deleted-region-text): Remove.

Fixes: debbugs:18886





(cua--last-deleted-region-pos, cua--last-deleted-region-text): Remove.

Fixes: debbugs:18886







Restore cua-delete-copy-to-register-0 and M-v command.
2014-10-30T19:19:49+00:00

Kim F. Storm

2014-10-30T19:19:49+00:00

71477684db6d781a07edda5060a0530da3623d96

* lisp/delsel.el (delete-selection-save-to-register)
(delsel--replace-text-or-position): New vars.
(delete-active-region): Use them.
(delete-selection-repeat-replace-region): New command, moved from
cua-base.el.
* lisp/emulation/cua-base.el (cua--repeat-replace-text): Remove var.
(cua-repeat-replace-region): Move command to delsel.el.
(cua--init-keymaps): Update binding accordingly.
(cua-mode): Set delete-selection-save-to-register.

Fixes: debbugs:18886





* lisp/delsel.el (delete-selection-save-to-register)
(delsel--replace-text-or-position): New vars.
(delete-active-region): Use them.
(delete-selection-repeat-replace-region): New command, moved from
cua-base.el.
* lisp/emulation/cua-base.el (cua--repeat-replace-text): Remove var.
(cua-repeat-replace-region): Move command to delsel.el.
(cua--init-keymaps): Update binding accordingly.
(cua-mode): Set delete-selection-save-to-register.

Fixes: debbugs:18886







Merge from emacs-24; up to 117634
2014-10-30T05:15:28+00:00

Glenn Morris

2014-10-30T05:15:28+00:00

52b410c60aebeb769ec9580af25ca50df2a44751