]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Mar 2015 01:48:35 +0000 (18:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Mar 2015 01:48:35 +0000 (18:48 -0700)
344c6ad Improve MS-Windows build instructions  (Bug#19989)
eb62887 lisp/dired.el (dired-delete-file): Doc fix.  (Bug#20021)

Conflicts:
lisp/ChangeLog
nt/ChangeLog

1  2 
lisp/ChangeLog
lisp/dired.el
nt/ChangeLog
nt/INSTALL

diff --cc lisp/ChangeLog
index ed28911497a949b1de8c0954c129fc02eaea3d1e,0e4e463e20007d8934f4d5b263bf4a7ea11c150f..fd7dcd31ffd5feacb80282689c05a905a831c199
 -2015-03-07  Eli Zaretskii  <eliz@gnu.org>
++2015-03-09  Eli Zaretskii  <eliz@gnu.org>
+       * dired.el (dired-delete-file): Doc fix.  (Bug#20021)
 +2015-03-06  Sergio Durigan Junior  <sergiodj@sergiodj.net>
 +          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  Dmitry Gutov  <dgutov@yandex.ru>
 +
 +      * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
 +      `font-lock-constant-face' for nil, true and false.  Highlight
 +      `self' as a keyword.  (Bug#17733)
 +
 +2015-03-08  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 +
 +      * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
 +      beginning of regexp also after open brace or vertical bar.
 +      (Bug#20026)
 +
 +2015-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * battery.el (battery-echo-area-format): Simplify default.
 +      (battery-linux-sysfs): Standardize on energy&power.  Accept ADP1
 +      for AC adapter.
 +
 +      * 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  Oscar Fuentes  <ofv@wanadoo.es>
 +
 +      * net/browse-url.el (browse-url-firefox): Remove outdated
 +      MS-Windows limitations.
 +
 +2015-03-06  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 +
 +      * 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  Ivan Shmakov  <ivan@siamics.net>
 +
 +      * net/eww.el (eww-html-p): New function (bug#20009).
 +      (eww-render): Use it.
 +
 +2015-03-05  Artur Malabarba  <bruce.connor.am@gmail.com>
 +
 +      * desktop.el (desktop-buffer-info): Write docstring.
 +      (desktop-buffer-info): Use `pushnew' instead of `add-to-list' and
 +      unquote lamda.
 +
 +      * emacs-lisp/package.el (package-refresh-contents): Update doc.
 +
 +2015-03-05  Dmitry Gutov  <dgutov@yandex.ru>
 +
 +      * progmodes/js.el (js-mode-syntax-table): Add an entry for `.
 +
 +2015-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      Replace *-function vars with generic functions in cl-generic.
 +      * 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.
 +      * emacs-lisp/eieio-core.el (eieio--generic-generalizer)
 +      (eieio--generic-subclass-generalizer): New consts.
 +      (cl-generic-generalizers): New methods.
 +      * 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.
 +      * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
 +      Unfold closures like lambdas.
 +
 +2015-03-04  Filipp Gunbin  <fgunbin@fastmail.fm>
 +
 +      * autorevert.el (auto-revert-notify-add-watch):
 +      Fix handler installation.  (Bug#20000)
 +
 +2015-03-04  Rüdiger Sonderfeld  <ruediger@c-plusplus.net>
 +
 +      * 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  Zhongwei Yao  <ashi08104@gmail.com>
 +
 +      * 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  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * 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/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/trampver.el: Update release number.
  
  2015-03-03  Agustín Martín Domingo  <agustin6martin@gmail.com>
  
diff --cc lisp/dired.el
Simple merge
diff --cc nt/ChangeLog
index cc77b18adbada4e60fdeb0b4deaf5d6f28bee38b,e11a923c23c92f01b364cdb969e021188c737bc3..78630415c6fd5d38239862ecde115dd55a6c7f44
@@@ -1,4 -1,15 +1,16 @@@
 -2015-03-07  Eli Zaretskii  <eliz@gnu.org>
++2015-03-09  Eli Zaretskii  <eliz@gnu.org>
+       * INSTALL: Add some more installation instructions for mingw-get
+       users.  (Bug#19989)
 -2015-02-10  Noam Postavsky  <npostavs@users.sourceforget.net>
++2015-03-09  Noam Postavsky  <npostavs@users.sourceforget.net>
+       * nt/cmdproxy.c (batch_file_p): New function.
+       (spawn): If calling a quoted batch file pass NULL for progname.
+       (Bug#18745)
 -2015-02-10  Eli Zaretskii  <eliz@gnu.org>
++2015-03-09  Eli Zaretskii  <eliz@gnu.org>
 +2015-03-03  Eli Zaretskii  <eliz@gnu.org>
  
        * cmdproxy.c (get_next_token): Don't make backslashes disappear
        without a trace when they are not followed by a quote.
diff --cc nt/INSTALL
Simple merge