merge master

1 files changed, 114 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 674b26716a4..b7a38af9609 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,107 @@
+2015-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/eieio-core.el: Provide support for cl-generic.
+        (eieio--generic-tagcode): New function.
+        (cl-generic-tagcode-function): Use it.
+        (eieio--generic-tag-types): New function.
+        (cl-generic-tag-types-function): Use it.
+        (eieio-object-p): Tighten up the test.
+
+        * emacs-lisp/cl-generic.el (cl-generic-define-method): Fix paren typo.
+
+2015-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/cl-generic.el: New file.
+
+        * emacs-lisp/cl-macs.el (cl-flet): Allow (FUN EXP) forms.
+        (cl-load-time-value, cl-labels): Use closures rather than
+        backquoted lambdas.
+        (cl-macrolet): Use `eval' to create the function value, and support CL
+        style arguments in for the defined macros.
+
+2015-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * net/eww.el: Use lexical-binding.
+        (eww-links-at-point): Remove unused arg.
+        (eww-mode-map): Inherit from special-mode-map.
+        (eww-mode): Derive from special-mode.  Don't use `setq' on a hook.
+
+2015-01-13  Alan Mackenzie  <acm@muc.de>
+
+        Allow compilation during loading of Modes derived from a CC Mode mode.
+        Fixes debbugs#19206.
+
+        * progmodes/cc-bytecomp.el (cc-bytecomp-compiling-or-loading):
+        New function which walks the stack to discover whether we're compiling
+        or loading.
+        (cc-bytecomp-is-compiling): Reformulate, and move towards
+        beginning.
+        (cc-bytecomp-is-loading): New defsubst.
+        (cc-bytecomp-setup-environment, cc-bytecomp-restore-environment):
+        Use the above defsubsts.
+        (cc-require-when-compile, cc-bytecomp-defvar)
+        (cc-bytecomp-defun): Simplify conditionals.
+
+        * progmodes/cc-defs.el (cc-bytecomp-compiling-or-loading):
+        "Borrow" this function from cc-bytecomp.el.
+        (c-get-current-file): Reformulate using the above.
+        (c-lang-defconst): Prevent duplicate entries of file names in a
+        symbol's 'source property.
+        (c-lang-const): Use cc-bytecomp-is-compiling.
+
+        * progmodes/cc-langs.el (c-make-init-lang-vars-fun):
+        Use cc-bytecomp-is-compiling.
+
+2015-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/eieio-core.el (eieio-defclass): Fix call to `defclass'
+        (bug#19552).
+
+2015-01-13  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * menu-bar.el (menu-bar-goto-menu): Before calling
+        `xref-marker-stack-empty-p', first check that `xref' is loaded.
+        (Bug#19554)
+
+2015-01-12  Martin Rudalics  <rudalics@gmx.at>
+
+        * progmodes/xref.el (xref-marker-stack-empty-p): Add autoload
+        cookie (Bug#19554).
+
+        * frame.el (frame-notice-user-settings): Remove code dealing with
+        frame-initial-frame-tool-bar-height.  Turn off `tool-bar-mode'
+        only if `window-system-frame-alist' or `default-frame-alist' ask
+        for it.
+        (make-frame): Update frame-adjust-size-history if needed.
+
+2015-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Have 'make' output better GEN names
+        * Makefile.in (PHONY_EXTRAS): New macro.
+        (.PHONY): Depend on it, and on $(lisp)/loaddefs.el, so that the
+        relevant files' time stamps are ignored.
+        (custom-deps, $(lisp)/cus-load.el, finder-data)
+        ($(lisp)/finder-inf.el): Use PHONY_EXTRAS.
+        (custom-deps, $(lisp)/cus-load.el, finder-data)
+        ($(lisp)/finder-inf.el, autoloads, $(lisp)/loaddefs.el)
+        ($(lisp)/subdirs.el, update-subdirs):
+        Output more-accurate destination names with GEN.
+
+        Say "ELC foo.elc" instead of "GEN foo.elc"
+        * Makefile.in (AM_V_ELC, am__v_ELC_, am__v_ELC_0, am__v_ELC_1):
+        New macros.
+        ($(THEFILE)c, .el.elc): Use them.
+
+2015-01-11  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.el (directory-files-recursively): Do not include
+        superfluous remote file names.
+
+2015-01-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/eww.el (eww): Interpret anything that looks like a protocol
+        designator as a full URL.
+
 2015-01-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * net/shr.el (shr-urlify): Don't bother the user about
@@ -363,8 +467,8 @@
         to `pre-command-hook'.
         (xref--xref-buffer-mode-map): Don't remap `next-line' and
         `previous-line'.  Additionally bind `xref-next-line' and
-        `xref-prev-line' to `n' and `p' respectively.  Bind
-        `xref-show-location-at-point' to `C-o'.
+        `xref-prev-line' to `n' and `p' respectively.
+        Bind `xref-show-location-at-point' to `C-o'.
 
 2015-01-01  Eli Zaretskii  <eliz@gnu.org>
 
@@ -553,15 +657,15 @@
         Add argument MSG to display user-friendly message when no process
         is running.
         (python-shell-switch-to-shell): Call pop-to-buffer with NORECORD.
-        (python-shell-make-comint): Rename argument SHOW from POP.  Use
-        display-buffer instead of pop-to-buffer.
+        (python-shell-make-comint): Rename argument SHOW from POP.
+        Use display-buffer instead of pop-to-buffer.
         (run-python): Doc fix.  Return process.
         (python-shell-get-or-create-process): Make obsolete.
 
 2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
-        * progmodes/python.el (python-shell-buffer-substring): Handle
-        cornercase when region sent starts at point-min.
+        * progmodes/python.el (python-shell-buffer-substring):
+        Handle cornercase when region sent starts at point-min.
 
 2014-12-27  Eli Zaretskii  <eliz@gnu.org>
 
@@ -733,8 +837,8 @@
 
 2014-12-25  Filipp Gunbin  <fgunbin@fastmail.fm>
 
-        * dired-aux.el (dired-maybe-insert-subdir): Make
-        dired-maybe-insert-subdir always skip trivial files.
+        * dired-aux.el (dired-maybe-insert-subdir):
+        Make dired-maybe-insert-subdir always skip trivial files.
 
 2014-12-25  Helmut Eller  <eller.helmut@gmail.com>
             Dmitry Gutov  <dgutov@yandex.ru>
@@ -779,8 +883,8 @@
 
         * window.el (mouse-autoselect-window-position-1): New variable.
         (mouse-autoselect-window-cancel)
-        (mouse-autoselect-window-select, handle-select-window): With
-        delayed autoselection select window only if mouse moves after
+        (mouse-autoselect-window-select, handle-select-window):
+        With delayed autoselection select window only if mouse moves after
         selecting its frame.
 
 2014-12-24  Michael Albinus  <michael.albinus@gmx.de>