1. 28 Jan, 2015 23 commits
    • Paul Eggert's avatar
      Merge from gnulib and try to repair bad merge · 39c2fa3f
      Paul Eggert authored
      This attempts to repair problems introduced by the bad merge
      5491fd10.  The easiest way for me
      to fix the badly-merged gnulib files was to run
      'admin/merge-gnulib', so I did that, which also imported the
      following changes:
      * build-aux/update-copyright, m4/gnulib.m4:
      Update from gnulib, incorporating:
      2015-01-15 time: port to MinGW32 3.21
      2015-01-15 update-copyright: apply to self
      2015-01-11 update-copyright: recognize groff's \(co marker
      39c2fa3f
    • Elias Oltmanns's avatar
      nnimap `never' expiration fix · 0cdd599c
      Elias Oltmanns authored
      * nnimap.el (nnimap-find-expired-articles): Fix handling of
      (expiry-wait . never).
      0cdd599c
    • Fabián Ezequiel Gallina's avatar
    • Fabián Ezequiel Gallina's avatar
      Cleanup lisp/ChangeLog · 028ddef7
      Fabián Ezequiel Gallina authored
      028ddef7
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 95a2cb24
      Fabián Ezequiel Gallina authored
      9664defd Signal a file-error from directory-files on MS-Windows  (Bug#19701)
      fd4e65e4 Added missing test for previous commit
      5485e3e5 python.el: New non-global state dependent indentation engine.
      3b23e6a7 Fix the description of --insert command-line option  (Bug#19694)
      7a7e5941 Add a cross-reference in ELisp manual.  (Bug#19668)
      b4f40757 Fixes: debbugs:19660
      83b3c312 * test/automated/regexp-tests.el: Require regexp-opt
      
      Conflicts:
      	lisp/progmodes/python.el
      95a2cb24
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · f5ebe84d
      Fabián Ezequiel Gallina authored
      The following commits were skipped:
      
      81fb8ab0 Backport: Fix package tests when TMPDIR is in HOME
      3a345b50 Backport: Handle the `neg' operator in some calc-units functions.
      f5ebe84d
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 33ab7ee0
      Fabián Ezequiel Gallina authored
      8ee825c3 doc/emacs/programs.texi (Custom C Indent): Fix a typo.  (Bug#19647)
      88ba49fe Fix coding.c subscript error
      3ea1b31f Prevent artist-mode from creating runaway timers (Bug#6130).
      33ab7ee0
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 85ca4767
      Fabián Ezequiel Gallina authored
      The following commits were skipped:
      
      4c09e3ae Backport: correct old fix for GTK font selection
      87309740 Backport from trunk of bug 19531.
      85ca4767
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 294127e7
      Fabián Ezequiel Gallina authored
      24aacfc9 Improve documentation of buttons  (Bug#19628)
      52ae3dbb doc/lispref/text.texi (Clickable Text): Improve indexing.  (Bug#19629)
      310f7074 lisp/button.el (button-activate, push-button): Doc fix.  (Bug#19628)
      3ee38f20 Disallow w32 builds --without-toolkit-scroll-bars.
      e6518fc8 Fix display of images in R2L screen lines
      b0af6745 Use u+05f4 in TUTORIAL.he.
      294127e7
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 358a8b34
      Fabián Ezequiel Gallina authored
      The following commit was skipped:
      
      7b8cba98 Backport: Parse pcomplete arguments regardless of pcomplete-cycle-completions
      358a8b34
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 4d0108a1
      Fabián Ezequiel Gallina authored
      a3505cb3 doc/lispref/variables.texi (Creating Buffer-Local): Improve indexing (Bug#19608)
      d132c7b6 erc-backend.el: Give hook-name a default value of nil and add-to-list unconditionally. Fixes debbugs:19363
      61cc7bf8 Fix support of non-ASCII frame titles on MS-Windows  (Bug#19590)
      1e5902ac * filenotify.el (file-notify--descriptor): Do not cons for remote files.
      b1ea1607 Handle watching of several files in the same directory for inotify.
      4d0108a1
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 32a2c916
      Fabián Ezequiel Gallina authored
      The following commits were skipped:
      
      67edddfc More fixes to support multi-line search in comint
      18a89a06 Better support for multi-line shell input.
      32a2c916
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · b0edd7c6
      Fabián Ezequiel Gallina authored
      b544ab56 Fix return value of vertical-motion at ZV  (Bug#19553)
      1f179ea1 Fix encoding of I/O in net-utils.el for MS-Windows.  (Bug#19458)
      70f298f8 Fix the description of -nl in --help text.  (Bug#19542)
      b0edd7c6
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · f4fcb103
      Fabián Ezequiel Gallina authored
      The following commit was skipped:
      
      7c0bfa1d Fix line-move-visual's following of column in R2L lines (backport from trunk).
      f4fcb103
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · e57f766d
      Fabián Ezequiel Gallina authored
      2a57b7e5 Fixes: debbugs:18756
      
      Conflicts:
      	lisp/ChangeLog
      e57f766d
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 63efa6c6
      Fabián Ezequiel Gallina authored
      The following commit was skipped:
      
      4e86e029 Backport: Add an extra column for Version in list-packages table
      63efa6c6
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · d7a89815
      Fabián Ezequiel Gallina authored
      d279e668 Fix assertion violations in try_window_id (Bug#19511)
      031eadcb Fix dired quoting bug with "Hit`N`Hide"
      5981b4b1 More doc fixes for bug#19502 -- make documentation less X-specific.
      143516c7 src/emacs.c (syms_of_emacs) <system-configuration>: Doc fix.  (Bug#19502)
      d7a89815
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 3a8b7013
      Fabián Ezequiel Gallina authored
      The following commit was skipped:
      
      d7af65d2 Backport: Unbreak `mouse-action' property in text buttons
      3a8b7013
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 0b2014f9
      Fabián Ezequiel Gallina authored
      e13e3bd8 * admin/update_autogen (commit): Prepend "# " to commit message.
      0b2014f9
    • Stefan Monnier's avatar
      Tighten up the tagcode used for eieio and cl-struct objects · 2668ac1a
      Stefan Monnier authored
      * lisp/emacs-lisp/eieio-core.el (eieio-defclass-internal): Set the function
      slot of the tag symbol to :quick-object-witness-check.
      (eieio-object-p): Use :quick-object-witness-check.
      (eieio--generic-tagcode): Use cl--generic-struct-tag.
      * lisp/emacs-lisp/cl-preloaded.el: New file.
      * lisp/emacs-lisp/cl-macs.el (cl--bind-inits): Remove, unused.
      (cl--transform-lambda, cl-destructuring-bind): Remove cl--bind-inits.
      (cl--make-usage-args): Strip away &aux args.
      (cl-case, cl-typecase, cl--parse-loop-clause): Use macroexp-let2.
      (cl-the, cl-check-type): Use macroexp-let2 and cl-typep.
      (cl-defstruct): Use `declare' and cl-struct-define.
      * lisp/emacs-lisp/cl-generic.el (cl--generic-struct-tag): New function.
      (cl--generic-struct-tagcode): Use it to tighten the tagcode.
      * lisp/loadup.el: Load cl-preloaded.
      * src/lisp.mk (lisp): Add cl-preloaded.
      2668ac1a
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 4fc35edd
      Fabián Ezequiel Gallina authored
      The following commit was skipped:
      
      780eb0a7 Auto-commit of loaddefs files.
      4fc35edd
    • Lars Magne Ingebrigtsen's avatar
    • Fabián Ezequiel Gallina's avatar
      Merge from origin/emacs-24 · 8e9166c9
      Fabián Ezequiel Gallina authored
      a012c7bb Fix copyright years by hand
      732fd4c7 Update copyright year to 2015
      
      Conflicts:
      	INSTALL.REPO
      	admin/notes/lel-TODO
      	doc/man/grep-changelog.1
      	doc/misc/eww.texi
      	etc/CONTRIBUTE
      	etc/GNU
      	etc/NEWS
      	etc/refcards/emacsver.tex
      	etc/refcards/ru-refcard.tex
      	lib-src/grep-changelog
      	lib-src/test-distrib.c
      	lib/alloca.in.h
      	lib/binary-io.h
      	lib/c-ctype.h
      	lib/c-strcasecmp.c
      	lib/c-strncasecmp.c
      	lib/careadlinkat.c
      	lib/close-stream.c
      	lib/dosname.h
      	lib/dup2.c
      	lib/filemode.h
      	lib/fpending.c
      	lib/fpending.h
      	lib/getgroups.c
      	lib/getloadavg.c
      	lib/getopt.in.h
      	lib/getopt1.c
      	lib/getopt_int.h
      	lib/gettext.h
      	lib/gettime.c
      	lib/gettimeofday.c
      	lib/group-member.c
      	lib/md5.c
      	lib/md5.h
      	lib/memrchr.c
      	lib/sha1.c
      	lib/sig2str.c
      	lib/stdarg.in.h
      	lib/stdbool.in.h
      	lib/stdlib.in.h
      	lib/strftime.c
      	lib/strtoimax.c
      	lib/strtol.c
      	lib/strtoll.c
      	lib/strtoull.c
      	lib/tempname.c
      	lib/time_r.c
      	lib/unsetenv.c
      	lib/xalloc-oversized.h
      	lisp/gnus/gnus-setup.el
      	lisp/progmodes/cap-words.el
      	lisp/w32-common-fns.el
      	m4/alloca.m4
      	m4/dup2.m4
      	m4/filemode.m4
      	m4/getgroups.m4
      	m4/getloadavg.m4
      	m4/gettime.m4
      	m4/gettimeofday.m4
      	m4/gnulib-common.m4
      	m4/group-member.m4
      	m4/manywarnings.m4
      	m4/memrchr.m4
      	m4/mktime.m4
      	m4/pathmax.m4
      	m4/pthread_sigmask.m4
      	m4/sig2str.m4
      	m4/ssize_t.m4
      	m4/st_dm_mode.m4
      	m4/stat-time.m4
      	m4/stdarg.m4
      	m4/stdbool.m4
      	m4/stddef_h.m4
      	m4/stdio_h.m4
      	m4/strftime.m4
      	m4/strtoimax.m4
      	m4/strtoll.m4
      	m4/strtoull.m4
      	m4/strtoumax.m4
      	m4/time_h.m4
      	m4/timer_time.m4
      	m4/timespec.m4
      	m4/unistd_h.m4
      	m4/utimbuf.m4
      	nextstep/README
      	nt/addsection.c
      	src/insdel.c
      	src/w32heap.c
      	test/automated/package-x-test.el
      8e9166c9
  2. 27 Jan, 2015 17 commits