Commit graph

64082 commits

Author SHA1 Message Date
Stefan Monnier
41bba4b40f * lisp/simple.el (goto-history-element): Don't burp on t history. 2015-03-11 10:54:56 -04:00
Paul Eggert
2a1be9eb23 Prefer "initialize" to "initialise"
* lisp/progmodes/js.el (js-indent-first-init):
Rename from js-indent-first-initialiser, to avoid worrying about
American vs British spelling.  All uses changed.
* test/indent/js-indent-init-t.js: Rename from
indent/js-indent-first-initialiser-t.js.
* test/indent/js-indent-init-dynamic.js: Rename from
test/indent/js-indent-first-initialiser-dynamic.js.
2015-03-10 16:29:59 -07:00
Glenn Morris
c3ca6a911a # Further ChangeLog fix 2015-03-10 18:46:39 -04:00
Glenn Morris
6c9681afe9 * lisp/progmodes/js.el (js-indent-first-initialiser): Fix doc, type, version.
First line of the doc string should be a complete sentence.

* etc/NEWS: Mention new option.

# Fix associated ChangeLog entries.
2015-03-10 18:40:09 -04:00
Glenn Morris
8db37916ca * lisp/gnus/message.el (message-valid-fqdn-regexp): Bump :version 2015-03-10 18:37:35 -04:00
Jackson Ray Hamilton
933e0ab4b0 New indentation option for js-mode
* lisp/progmodes/js.el (js--proper-indentation): Add new custom option
`js-indent-first-initialiser' and a function to utilize it,
`js--maybe-goto-declaration-keyword-end'.

* test/indent/js.js: Add local variables.

* test/indent/js-indent-first-initialiser-t.js: New test for
`js-indent-first-initialiser'.

* test/indent/js-indent-first-initialiser-dynamic.js: New test for
`js-indent-first-initialiser'.
2015-03-10 10:19:07 -07:00
Paul Eggert
33d9869b5f Spelling and minor grammar fixes 2015-03-10 00:49:57 -07:00
Thomas Fitzsimmons
ff03266277 Recognize more LDAP attributes
Fixes: debbugs:8983

* net/ldap.el (ldap-attribute-syntaxes-alist): Add LDAP attributes
from RFC2798 Section 9.1.1.  (Bug#8983)
2015-03-09 21:02:37 -04:00
Nicolas Petton
b7ed48c3ce Add seq-into as a public function
* lisp/emacs-lisp/seq.el: Make seq-into a public function (replacing
seq--into)
* test/automated/seq-tests.el: Add tests for seq-into
* doc/lispref/sequences.texi: Add documentation for seq-into
2015-03-09 12:50:24 +01:00
Dmitry Gutov
8854b9cf52 ruby-mode: Detect regexps after `!'
Fixes: debbugs:19285

* lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect
regexps after `!'.
2015-03-09 05:53:58 +02:00
Dmitry Gutov
4fab7badf5 ruby-mode: Don't consider =' a part of symbol when followed by >'
Fixes: debbugs:18644

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't consider
`=' a part of symbol when followed by `>'.
2015-03-09 05:26:57 +02:00
Paul Eggert
0c1dd712f7 Fix ChangeLog typos 2015-03-08 18:54:18 -07:00
Paul Eggert
59c414b1d0 Merge from origin/emacs-24
113fcc3 * etc/AUTHORS: Update the AUTHORS file
51c0c8d * lisp/ChangeLog: Fix a changelog entry

Conflicts:
	etc/AUTHORS
2015-03-08 18:49:27 -07:00
Paul Eggert
8e07ea1a05 Merge from origin/emacs-24
344c6ad Improve MS-Windows build instructions  (Bug#19989)
eb62887 lisp/dired.el (dired-delete-file): Doc fix.  (Bug#20021)

Conflicts:
	lisp/ChangeLog
	nt/ChangeLog
2015-03-08 18:48:35 -07:00
Sergio Durigan Junior
6df13146cc EUDC: Support BBDB >= 3
Fixes: bug#19678

Co-authored-by: Thomas Fitzsimmons <fitzsim@fitzsim.org>
* net/eudcb-bbdb.el (eudc-bbdb-field): New function.
(eudc-bbdb-filter-non-matching-record): Call eudc-bbdb-field.
(eudc-bbdb-format-record-as-result): Likewise.
2015-03-08 21:12:11 -04:00
Adam Sjøgren
6b134bcba9 lisp/gnus/gnus-notifications.el (gnus-notifications-action): Replace x-focus-frame kludge by calling gnus-select-frame-set-input-focus 2015-03-08 22:45:06 +00:00
Dmitry Gutov
e991af9228 ruby-mode: Change faces used for self, true, false and nil
Fixes: debbugs:17733

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
`font-lock-constant-face' for nil, true and false.  Highlight
`self' as a keyword.
2015-03-08 22:10:45 +02:00
Nobuyoshi Nakada
dad0fc589c ruby-mode: Expect regexp after { or | too
Fixes: debbugs:20026

* progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
beginning of regexp also after open brace or vertical bar.
2015-03-08 20:57:29 +02:00
Nicolas Petton
51c0c8dc70 * lisp/ChangeLog: Fix a changelog entry 2015-03-08 15:41:15 +01:00
Glenn Morris
126cd1461a # Auto-commit of loaddefs files. 2015-03-08 06:23:06 -04:00
Rasmus Pank Roulund
08534cef42 lisp/gnus/gnus-notifications: Raise frame when clicking Read; Add mark as read 2015-03-08 10:10:37 +00:00
Adam Sjøgren
0f2fd5603a lisp/gnus/message.el (message-insert-formatted-citation-line): Change %F to fall back to email address if no first name could be determined 2015-03-08 10:06:51 +00:00
Michael Albinus
9869d6f612 Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.
Fixes: debbugs:20015

* net/tramp.el (tramp-ssh-controlmaster-options): Make it a
defcustom.
2015-03-07 21:02:04 +01:00
Michael Albinus
8182282319 Revert "Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master."
This reverts commit 5ab767b8dc.
2015-03-07 21:01:01 +01:00
Michael Albinus
5ab767b8dc Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.
Fixes: debbugs:20015

* net/tramp.el (tramp-ssh-controlmaster-options): Make it a defcustom.
2015-03-07 20:57:32 +01:00
Eli Zaretskii
eb62887e97 lisp/dired.el (dired-delete-file): Doc fix. (Bug#20021) 2015-03-07 11:55:58 +02:00
Stefan Monnier
35e2b6ab4d * lisp/gnus/*registry.el: Use slot names rather than initarg names
* lisp/gnus/registry.el (registry-lookup-breaks-before-lexbind)
(registry-search, registry-delete, registry-size, registry-insert)
(registry-reindex, registry-collect-prune-candidates, registry-lookup):
* lisp/gnus/gnus-registry.el (gnus-registry-fixup-registry)
(gnus-registry-remove-extra-data): Use slot names rather than initarg
names in `oref' and `oset'.
2015-03-06 23:50:32 -05:00
Stefan Monnier
0ea68311a5 * lisp/battery.el: Make it work on my MSI Wind
* lisp/battery.el (battery-echo-area-format): Simplify default.
(battery-linux-sysfs): Standardize on energy&power.  Accept ADP1
for AC adapter.
2015-03-06 23:42:10 -05:00
Stefan Monnier
25058c3ab8 * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Don't try to
unfold `closure's since byte-compile-unfold-lambda doesn't know how to
do it.
2015-03-06 23:35:04 -05:00
Oscar Fuentes
20c6b227ea browse-url-firefox: removed MS-Windows limitations
net/browse-url.el (browse-url-firefox): Removed outdated
MS-Windows limitations.
2015-03-06 17:18:45 +01:00
Thomas Fitzsimmons
bfebebbc72 Fix EUDC LDAP duplicate mail handling
Fixes: debbugs:17720

* net/eudcb-ldap.el (eudc-ldap-cleanup-record-simple): Mark as
obsolete.
(eudc-ldap-cleanup-record-filtering-addresses): Add docstring.
Don't clean up postal addresses if ldap-ignore-attribute-codings
is set.  Combine mail addresses into one field. (Bug#17720)
(eudc-ldap-simple-query-internal): Call
eudc-ldap-cleanup-record-filtering-addresses instead of
eudc-ldap-cleanup-record-simple.
(eudc-ldap-get-field-list): Likewise.
2015-03-05 21:54:27 -05:00
Ivan Shmakov
b08f8bb06a Render application/xhtml+xml as HTML
Fixes: debbugs:20009

* lisp/net/eww.el (eww-html-p): New function.
(eww-render): Use it.
2015-03-05 23:26:34 +01:00
Artur Malabarba
61e06b6cb2 desktop.el (desktop-buffer-info): Use `pushnew'. 2015-03-05 13:43:27 +00:00
Artur Malabarba
6065fbe0d2 desktop.el (desktop-buffer-info): Write docstring. 2015-03-05 13:37:23 +00:00
Artur Malabarba
17ecfea3b9 package.el (package-refresh-contents): Update doc. 2015-03-05 13:25:53 +00:00
Dmitry Gutov
77ab7f8455 Teach js-mode about ES6 template strings
* lisp/progmodes/js.el (js-mode-syntax-table): Add an entry for `.
2015-03-05 04:33:36 +02:00
Stefan Monnier
21c547863d Replace *-function vars with generic functions in cl-generic.
* lisp/emacs-lisp/cl-generic.el (cl--generic-generalizer): New struct.
(cl-generic-tagcode-function, cl-generic-tag-types-function): Remove.
(cl--generic-t-generalizer): New const.
(cl--generic-make-method): Rename from `cl--generic-method-make'.
(cl--generic-make): Change calling convention.
(cl--generic): Add `options' field.
(cl-generic-function-options): New function.
(cl-defgeneric): Rewrite handling of options.  Add support for :method
options and allow the use of a default body.
(cl-generic-define): Save options in the corresponding new field.
(cl-defmethod): Fix ordering of qualifiers.
(cl-generic-define-method): Use cl-generic-generalizers.
(cl--generic-get-dispatcher): Change calling convention, and change
calling convention of the returned function as well so as to take the
list of methods separately from the generic function object, so that it
can receive the original generic function object.
(cl--generic-make-next-function): New function, extracted from
cl--generic-make-function.
(cl--generic-make-function): Use it.
(cl-generic-method-combination-function): Remove.
(cl--generic-cyclic-definition): New error.
(cl-generic-call-method): Take a generic function object rather than
its name.
(cl-method-qualifiers): New alias.
(cl--generic-build-combined-method): Use cl-generic-combine-methods,
don't segregate by qualifiers here any more.
(cl--generic-standard-method-combination): Segregate by qualifiers
here instead.  Add support for the `:extra' qualifier.
(cl--generic-cache-miss): Move earlier, adjust to new calling convention.
(cl-generic-generalizers, cl-generic-combine-methods):
New generic functions.
(cl-no-next-method, cl-no-applicable-method, cl-no-primary-method):
Use the new "default method in defgeneric" functionality, change
calling convention to receive a generic function object.
(cl--generic-head-used): New var.
(cl--generic-head-generalizer, cl--generic-eql-generalizer)
(cl--generic-struct-generalizer, cl--generic-typeof-generalizer):
New consts.
* lisp/emacs-lisp/eieio-core.el (eieio--generic-generalizer)
(eieio--generic-subclass-generalizer): New consts.
(cl-generic-generalizers): New methods.
* lisp/emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-generalizer)
(eieio--generic-static-object-generalizer): New consts.
(cl-generic-generalizers) <(head eieio--static)>: New method.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Unfold closures like lambdas.
2015-03-04 20:04:57 -05:00
Glenn Morris
69204d5a8a # Changelog fixes (no need to merge to trunk) 2015-03-04 09:04:54 -08:00
Glenn Morris
0ec2600a49 # Changelog fixes 2015-03-04 09:02:44 -08:00
Filipp Gunbin
5599661ead * autorevert.el (auto-revert-notify-add-watch): fix handler installation
Fixes: bug#20000
2015-03-04 19:39:24 +03:00
Rüdiger Sonderfeld
6c0a602fb8 eww: Fix some docstrings/error message.
* net/eww.el (eww-search-prefix, eww-open-file, eww-search-words)
(eww-same-page-p,eww-set-character-encoding): Fix docstring.
(eww): Do not end error messages with a period.
2015-03-04 12:38:22 +01:00
Zhongwei Yao
b9d09d80d2 Support port numbers in tramp-adb
* net/tramp-adb.el (tramp-adb-connect-if-not-connected):
New user option.
(tramp-adb-ls-toolbox-regexp): Fix regexp in order to support file
names starting with a space.
(tramp-methods): Add `tramp-default-port' for "adb".
(tramp-adb-parse-device-names): Add traces.  Return device names
with port, if present.
(tramp-adb-handle-directory-files-and-attributes): Quote all
remote file names.
(tramp-adb-get-device): New defun.
(tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
Use it.
(tramp-adb-maybe-open-connection): Set `tramp-current-*'
variables.  Remove checks for listed devices.
2015-03-04 11:13:19 +01:00
Michael Albinus
8ac08792a7 Sync with Tramp upstream.
* net/tramp-cache.el (tramp-dump-connection-properties):
Use `with-temp-file'.

* net/tramp-sh.el (tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes): Escape apostrophs in
file names.
(tramp-do-file-attributes-with-stat): Quote file name.
(tramp-sh-handle-directory-files-and-attributes): Fall back to
`tramp-handle-directory-files-and-attributes' in case of problems.
(tramp-do-directory-files-and-attributes-with-stat)
(tramp-sh-handle-file-name-all-completions)
(tramp-sh-handle-delete-directory)
(tramp-sh-handle-expand-file-name, tramp-sh-handle-process-file):
Normalize use of "cd".
(tramp-do-directory-files-and-attributes-with-stat): Use the
`quoting-style' arg of `ls' if possible.  Make it also working for
file names with apostrophs.
(tramp-sh-handle-file-name-all-completions): Use arguments of `ls'
in proper order.
(tramp-do-copy-or-rename-file-via-buffer)
(tramp-sh-handle-file-local-copy): Use `with-temp-file'.
(tramp-get-remote-locale): Accept also \r in output.
(tramp-get-ls-command-with-quoting-style): New defun.
(tramp-get-inline-coding): Set `default-directory' to a local
directory.  Sporadically, `call-process-region' does not handle a
remote default directory properly.

* net/tramp.el (tramp): Add :link property.
(tramp-login-prompt-regexp): Allow also "user", as required by
Fritz!Box telnet.
(tramp-autoload-file-name-handler): Use "/".
(tramp-handle-unhandled-file-name-directory): Return nil when
required by the spec.

* net/trampver.el: Update release number.
2015-03-04 11:02:36 +01:00
Paul Eggert
5d9b1e100a Spelling fixes 2015-03-03 15:10:40 -08:00
Paul Eggert
98284ef51c Merge from origin/emacs-24
c4ade11 textmodes/ispell.el: Look for aspell .dat files also under dict-dir
e28ec9a ispell.el: Extend to aspell current hunspell handling of aliases

Conflicts:
	lisp/ChangeLog
2015-03-03 14:52:04 -08:00
Paul Eggert
37ad855a38 Merge from origin/emacs-24
f160106 Avoid assertion violations in Rmail due to newline cache
1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote
1817892 Avoid erratic behavior of menu-bar tooltips on w32  (Bug#19925)
0260932 Bump python.el version
b0adfc7 Spelling fixes
35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged.
86fe750 # Remove NEWS temporary markup
4fa778b erc.el: Add old version header for package.el compatibilty
9366f05 Tramp: Disable paging with PAGER=cat

Conflicts:
	admin/notes/repo
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog
2015-03-03 14:41:30 -08:00
Paul Eggert
923602fefb Merge from origin/emacs-24
0077b36 # NEWS copyedits
3ca2ff3 * lisp/erc/erc.el (erc-rename-buffers): Doc fix.  Add :version.
b85523f * lisp/textmodes/flyspell.el (flyspell-duplicate-distance):
decb48d Augment text-mode syntax table for a few special characters
8b3ba7a Improve docs of transient-mark-mode  (Bug#19841)
72fd047 NEWS: Add section to include ERC changes
a7254bb Improve string search in `flyspell-word-search-*`. (Bug#16800)

Conflicts:
	etc/ChangeLog
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog
2015-03-03 14:38:53 -08:00
Paul Eggert
e2ae1c5a40 Merge from origin/emacs-24
4b0b27d Fix invocation of commands whose file name includes extension
87fc99f Better support for the case of typing RET on the prompt in comint.
a7b1c2f Don't lose frame's background color when setting foreground
20c817d Fix handling of frame color parameters in TTY sessions
eca7da1 Complete the remaining documentation updates for 24.5

Conflicts:
	doc/lispref/ChangeLog
	etc/NEWS
	lisp/ChangeLog
	nt/ChangeLog
	src/ChangeLog
2015-03-03 14:37:43 -08:00
Paul Eggert
2c82deee7f Merge from origin/emacs-24
c0ba590 Fix vertical-motion and posn-at-point when word-wrap is
a323b93 Better multi-line input support in comint.el
008a04a todo-mode.el: Restore point on setting item done  (Bug#19727)
9615c0d doc/misc/erc.texi: fix typo
c648717 Update ERC docs and update MAINTANERS to include myself
d825f66 Fix filling circle/ellipse in Artist Mode  (Bug#19763)

Conflicts:
	admin/ChangeLog
	doc/misc/ChangeLog
	doc/misc/erc.texi
	lisp/ChangeLog
	src/ChangeLog
2015-03-03 14:35:41 -08:00
Paul Eggert
f15c858319 Merge from origin/emacs-24
ec26c23 authors.el: Add missing ignored and renamed files
e589765 A more thorough fix for bug#19307
4e8d586 Fix last commit
d6fee01 Tramp: Don't use a tempfile for ControlPath.
27e11c0 Fix display of overlay strings with faces after ellipsis  (Bug#19307)
e9a7e10 Fix redrawing of mode lines when exposed  (Bug#19721)
50f3811 net/tramp.el (tramp-ssh-controlmaster-options): Use "%C"

Conflicts:
	lisp/ChangeLog
	src/ChangeLog
	src/xdisp.c
2015-03-03 14:29:22 -08:00