Author: Glenn Morris
Revision Date: 2018-11-12 17:38:27 UTC

; Merge from origin/emacs-26

The following commit was skipped:

e3b3683 (origin/emacs-26) Bump Emacs version to 26.1.90

Author: Bileto Bot
Revision Date: 2016-09-06 18:56:12 UTC

Auto commit Tue Sep 6 18:56:12 UTC 2016

Author: CI Train Bot Account
Revision Date: 2016-08-22 12:56:22 UTC

Auto commit Mon Aug 22 12:56:22 UTC 2016

Author: Robert Bruce Park
Revision Date: 2013-05-10 08:43:12 UTC

Only include manpages when they exist.

Author: Daniel Colascione
Revision Date: 2011-03-08 07:44:45 UTC

apply change 5.594 from cc-mode CVS

Author: Daniel Colascione
Revision Date: 2011-02-27 03:02:04 UTC

Remove useless comment

Author: ken manheimer
Revision Date: 2010-12-25 23:34:19 UTC

wrap define-minor-mode allout-mode in eval-and-compile, to help demonstrate
this problem:

serious problem with byte-compiled function created by define-minor-mode:

    i'm extremely perplexed, and blocked, by a problem i'm encountering in
    the process of migrating allout-mode minor mode (allout.el) to
    `define-minor-mode'. some key substitutions way deep in my code do not
    happen if the minor mode was established by a byte-compiled version of
    the function, but do happen if the mode definition is explicitly
    evaluated.

    i can even reproduce the problem by wrapping the define-minor-mode in
    either `eval-and-compile' or `eval-when-compile' and doing an
    `emacs-lisp-byte-compile-and-load'. when byte-compiling and loading
    with the eval-when-compile, invoking the mode yields the key
    substitutions, as it ought. (of course, the step of loading the
    byte-compiled code is irrelevant at that point, because the function
    isn't in the byte-compiled code. it's only defined because it was
    evaluated during the byte-compile.) with the eval-and-compile, loading
    the byte-compiled allout.elc wipes out the key substitutions - they're
    no longer in effect. of course, the lack of the function in the
    byte-compiled code when using eval-when-compile makes the byte-compiled
    code useless, so i have no workaround for the problem, just a weird
    demonstration of it.

    i've tried tracking down the failed key substitutions, by wrapping
    define-key with some advice that noted when the key defines happened,
    and they do every time the mode is activated, whether or not it's via
    the byte-compiled version of the mode function (when defined by
    define-minor-mode). my function which does the key substitutions
    (allout-setup-mode-map) uses fset to ensure that the mode map is
    properly globally established, so it's already kind of complicated.
    i'm also wondering whether i'm just misunderstanding something about
    the way define-minor-mode is supposed to work.

    i would love some help with this - migrating to define-minor-mode is
    one of the last things in my allout-mode update, but i've spent way
    too much time just tracking down the problem, and am more than
    reluctant to try to unravel the interaction between the byte-compiler
    and modes defined with define-minor-mode! but i'm completely blocked
    by this problem.

    to see the problem, visit this version of allout.el and start
    allout-mode. then emacs-lisp-byte-compile-and-load the code, and
    you'll find that \C-a is bound to move-beginning-of-line, as it
    normally is - not replaced by allout-beginning-of-line, as it should
    be.

    then change the `eval-and-compile' that's wrapped around the
    define-minor-mode allout-mode to `eval-when-compile', do
    emacs-lisp-byte-compile-and-load, and you'll find that \C-a is
    properly bound to allout-beginning-of-line. (you can also just
    manually evaluate the define-minor-mode - that will also the
    keysubsitutions in the keymap immediately.)

Author: Reinhard Tartler
Revision Date: 2010-11-19 19:52:21 UTC

update fix-huge-fonts.diff for non-minimal diff

Author: Chong Yidong
Revision Date: 2010-11-03 23:21:51 UTC

* emacs-lisp/package.el (package-unpack): Remove no-op.
(package--builtins, package--dir): Doc fix.
(package-activate-1, package-activate, package-install)
(package-compute-transaction): Fix error message.
(package-delete): Use delete-directory. Omit system packages.
(package-initialize): Set package-alist to nil first.
(package-menu-mark-delete, package-menu-mark-install): Don't add
symbols that are inconsistent with the package state.
(package-menu-execute): Perform deletions and installations as
single batch operations.

Author: safanaj
Revision Date: 2010-08-22 23:04:29 UTC

merge revno 101162 from lp:emacs

Author: Arik
Revision Date: 2010-08-19 01:32:01 UTC

added mode-line updates to other places where revision might change

Author: Arik
Revision Date: 2010-08-03 18:56:54 UTC

changes to branching and merging based on Stefan's suggestions. Use
tmp file for merge tagging and do not support the case of non-base
tagging (though non-merge tagging still supported). Default
branch-postfix to null string.

Author: dcox1524
Revision Date: 2010-01-06 17:17:45 UTC

Updated copyright to include 2010.

Author: Ian Clatworthy
Revision Date: 2009-11-27 02:59:46 UTC

Update copyright to include 2010