commit 96973dea40b4214fe645258be81ac19102fb246e (HEAD, refs/remotes/origin/master) Author: Glenn Morris Date: Tue Oct 6 23:31:43 2015 -0700 ; * admin/MAINTAINERS: Remove no-longer-active people diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 3283bf8..322803b 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -11,9 +11,6 @@ keen interest in). There's no need to list files where you are mentioned in the file's header. ============================================================================== -Jason Rumney - W32 - Eli Zaretskii src/bidi.c @@ -49,17 +46,6 @@ Stefan Monnier minibuffer completion lisp/outline.el -Miles Bader - src/xfaces.c - field-property related stuff - lisp/comint.el - lisp/shell.el - [other comint-related packages] - lisp/button.el - lisp/image-file.el - lisp/minibuf-eldef.el - lisp/rfn-eshadow.el - Jay Belanger Calc lisp/calc/* @@ -200,12 +186,6 @@ Stefan Monnier lisp/progmodes/tcl.el lisp/emacs-lisp/easymenu.el -Miles Bader - src/eval.c - src/bytecode.c - src/editfns.c - lisp/textmodes/refill.el - Artur Malabarba lisp/isearch.el commit 78769755b9daf907a6b4c9efee977610ca3003a5 Author: Glenn Morris Date: Tue Oct 6 23:30:45 2015 -0700 ; * admin/MAINTAINERS: Copyedits. diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 3f5cb7a..3283bf8 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -5,14 +5,10 @@ what parts of the Emacs distribution. The areas can be defined "arbitrarily", but should provide fairly well-defined boundaries so that there are not too many ambiguities. -The list below consists of 2 parts. First, the list of areas that -someone wants to be maintaining (i.e. has a particularly keen interest -for it); then the list of areas that someone is willing to maintain, -although he would not necessarily mind if someone else was the -official maintainer. - ============================================================================== -1. +1. Areas that someone wants to be maintaining (i.e. has a particularly +keen interest in). There's no need to list files where you are +mentioned in the file's header. ============================================================================== Jason Rumney @@ -145,7 +141,8 @@ Ulf Jasper test/automated/icalendar-tests.el ============================================================================== -2. +2. Areas that someone is willing to maintain, although he would not +necessarily mind if someone else was the official maintainer. ============================================================================== Kelvin White commit 2ad5109a759badf0bc35d405319a541beea7a146 Author: Glenn Morris Date: Tue Oct 6 23:29:13 2015 -0700 ; * admin/MAINTAINERS: Remove "unmaintained" section; neither correct nor useful diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 8b7647e..3f5cb7a 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -5,12 +5,11 @@ what parts of the Emacs distribution. The areas can be defined "arbitrarily", but should provide fairly well-defined boundaries so that there are not too many ambiguities. -The list below consists of 3 parts. First, the list of areas that +The list below consists of 2 parts. First, the list of areas that someone wants to be maintaining (i.e. has a particularly keen interest for it); then the list of areas that someone is willing to maintain, although he would not necessarily mind if someone else was the -official maintainer; and finally the list of areas for which no -maintainer has been found so far. +official maintainer. ============================================================================== 1. @@ -258,555 +257,6 @@ Vibhav Pant lisp/net/browse-url.el lisp/erc/* -============================================================================== -3. -============================================================================== - -admin/admin.el -admin/authors.el -admin/build-configs -admin/bzrmerge.el -admin/charsets/* -admin/check-doc-strings -admin/cus-test.el -admin/diff-tar-files -admin/find-gc.el -admin/gitmerge.el -admin/make-emacs -admin/quick-install-emacs -admin/unidata/blocks.awk -etc/edt-user.el -etc/forms/forms-d2.el -etc/forms/forms-pass.el -etc/nxml/* -etc/themes/* -leim/* -lisp/abbrev.el -lisp/align.el -lisp/allout-widgets.el -lisp/allout.el -lisp/ansi-color.el -lisp/apropos.el -lisp/array.el -lisp/autoarg.el -lisp/autoinsert.el -lisp/autorevert.el -lisp/avoid.el -lisp/battery.el -lisp/bindings.el -lisp/bookmark.el -lisp/bs.el -lisp/buff-menu.el -lisp/calculator.el -lisp/calendar/* -lisp/case-table.el -lisp/cdl.el -lisp/cedet/* -lisp/chistory.el -lisp/cmuscheme.el -lisp/color.el -lisp/completion.el -lisp/composite.el -lisp/cus-dep.el -lisp/cus-edit.el -lisp/cus-face.el -lisp/cus-start.el -lisp/cus-theme.el -lisp/custom.el -lisp/dabbrev.el -lisp/delim-col.el -lisp/delsel.el -lisp/descr-text.el -lisp/desktop.el -lisp/dframe.el -lisp/dired-aux.el -lisp/dired-x.el -lisp/dired.el -lisp/dirtrack.el -lisp/disp-table.el -lisp/dnd.el -lisp/dom.el -lisp/double.el -lisp/dynamic-setting.el -lisp/ebuff-menu.el -lisp/echistory.el -lisp/edmacro.el -lisp/ehelp.el -lisp/elec-pair.el -lisp/electric.el -lisp/elide-head.el -lisp/emacs-lisp/advice.el -lisp/emacs-lisp/autoload.el -lisp/emacs-lisp/avl-tree.el -lisp/emacs-lisp/backquote.el -lisp/emacs-lisp/benchmark.el -lisp/emacs-lisp/bindat.el -lisp/emacs-lisp/byte-opt.el -lisp/emacs-lisp/byte-run.el -lisp/emacs-lisp/bytecomp.el -lisp/emacs-lisp/cconv.el -lisp/emacs-lisp/chart.el -lisp/emacs-lisp/check-declare.el -lisp/emacs-lisp/checkdoc.el -lisp/emacs-lisp/cl-extra.el -lisp/emacs-lisp/cl-generic.el -lisp/emacs-lisp/cl-indent.el -lisp/emacs-lisp/cl-lib.el -lisp/emacs-lisp/cl-macs.el -lisp/emacs-lisp/cl-preloaded.el -lisp/emacs-lisp/cl-seq.el -lisp/emacs-lisp/cl.el -lisp/emacs-lisp/copyright.el -lisp/emacs-lisp/crm.el -lisp/emacs-lisp/cursor-sensor.el -lisp/emacs-lisp/debug.el -lisp/emacs-lisp/derived.el -lisp/emacs-lisp/disass.el -lisp/emacs-lisp/easy-mmode.el -lisp/emacs-lisp/edebug.el -lisp/emacs-lisp/eieio-base.el -lisp/emacs-lisp/eieio-compat.el -lisp/emacs-lisp/eieio-core.el -lisp/emacs-lisp/eieio-custom.el -lisp/emacs-lisp/eieio-datadebug.el -lisp/emacs-lisp/eieio-opt.el -lisp/emacs-lisp/eieio-speedbar.el -lisp/emacs-lisp/eieio.el -lisp/emacs-lisp/eldoc.el -lisp/emacs-lisp/elint.el -lisp/emacs-lisp/elp.el -lisp/emacs-lisp/ert-x.el -lisp/emacs-lisp/ert.el -lisp/emacs-lisp/ewoc.el -lisp/emacs-lisp/find-func.el -lisp/emacs-lisp/float-sup.el -lisp/emacs-lisp/generator.el -lisp/emacs-lisp/generic.el -lisp/emacs-lisp/gv.el -lisp/emacs-lisp/helper.el -lisp/emacs-lisp/inline.el -lisp/emacs-lisp/lisp-mnt.el -lisp/emacs-lisp/lisp-mode.el -lisp/emacs-lisp/lisp.el -lisp/emacs-lisp/macroexp.el -lisp/emacs-lisp/map-ynp.el -lisp/emacs-lisp/nadvice.el -lisp/emacs-lisp/package-x.el -lisp/emacs-lisp/pcase.el -lisp/emacs-lisp/pp.el -lisp/emacs-lisp/re-builder.el -lisp/emacs-lisp/regexp-opt.el -lisp/emacs-lisp/regi.el -lisp/emacs-lisp/ring.el -lisp/emacs-lisp/rx.el -lisp/emacs-lisp/shadow.el -lisp/emacs-lisp/smie.el -lisp/emacs-lisp/syntax.el -lisp/emacs-lisp/tabulated-list.el -lisp/emacs-lisp/tcover-ses.el -lisp/emacs-lisp/tcover-unsafep.el -lisp/emacs-lisp/testcover.el -lisp/emacs-lisp/timer.el -lisp/emacs-lisp/tq.el -lisp/emacs-lisp/trace.el -lisp/emacs-lisp/unsafep.el -lisp/emacs-lisp/warnings.el -lisp/emacs-lock.el -lisp/emulation/* -lisp/env.el -lisp/epa-dired.el -lisp/epa-file.el -lisp/epa-hook.el -lisp/epa-mail.el -lisp/epa.el -lisp/epg-config.el -lisp/epg.el -lisp/eshell/* -lisp/expand.el -lisp/ezimage.el -lisp/face-remap.el -lisp/facemenu.el -lisp/faces.el -lisp/ffap.el -lisp/filecache.el -lisp/files-x.el -lisp/files.el -lisp/filesets.el -lisp/find-cmd.el -lisp/find-dired.el -lisp/find-file.el -lisp/find-lisp.el -lisp/finder.el -lisp/flow-ctrl.el -lisp/foldout.el -lisp/follow.el -lisp/font-core.el -lisp/font-lock.el -lisp/format-spec.el -lisp/format.el -lisp/forms.el -lisp/frame.el -lisp/frameset.el -lisp/fringe.el -lisp/generic-x.el -lisp/gnus/* -lisp/gs.el -lisp/help-at-pt.el -lisp/help-fns.el -lisp/help-macro.el -lisp/help-mode.el -lisp/help.el -lisp/hex-util.el -lisp/hfy-cmap.el -lisp/hi-lock.el -lisp/hilit-chg.el -lisp/hippie-exp.el -lisp/hl-line.el -lisp/htmlfontify.el -lisp/ibuf-ext.el -lisp/ibuf-macs.el -lisp/ibuffer.el -lisp/icomplete.el -lisp/ido.el -lisp/ielm.el -lisp/iimage.el -lisp/image-dired.el -lisp/image-mode.el -lisp/image.el -lisp/imenu.el -lisp/indent.el -lisp/info-look.el -lisp/info-xref.el -lisp/informat.el -lisp/international/* -lisp/isearch.el -lisp/isearchb.el -lisp/jit-lock.el -lisp/jka-cmpr-hook.el -lisp/jka-compr.el -lisp/json.el -lisp/kermit.el -lisp/kmacro.el -lisp/language/* -lisp/leim/* -lisp/linum.el -lisp/loadhist.el -lisp/loadup.el -lisp/locate.el -lisp/lpr.el -lisp/macros.el -lisp/mail/binhex.el -lisp/mail/blessmail.el -lisp/mail/emacsbug.el -lisp/mail/feedmail.el -lisp/mail/footnote.el -lisp/mail/hashcash.el -lisp/mail/mail-extr.el -lisp/mail/mail-hist.el -lisp/mail/mail-utils.el -lisp/mail/mailabbrev.el -lisp/mail/mailalias.el -lisp/mail/mailclient.el -lisp/mail/mailheader.el -lisp/mail/metamail.el -lisp/mail/mspools.el -lisp/mail/reporter.el -lisp/mail/rfc2368.el -lisp/mail/rfc822.el -lisp/mail/sendmail.el -lisp/mail/smtpmail.el -lisp/mail/supercite.el -lisp/mail/uce.el -lisp/mail/undigest.el -lisp/mail/unrmail.el -lisp/mail/uudecode.el -lisp/makesum.el -lisp/man.el -lisp/master.el -lisp/mb-depth.el -lisp/md4.el -lisp/mh-e/* -lisp/midnight.el -lisp/minibuffer.el -lisp/misc.el -lisp/misearch.el -lisp/mouse-copy.el -lisp/mouse-drag.el -lisp/mouse.el -lisp/mpc.el -lisp/msb.el -lisp/mwheel.el -lisp/net/ange-ftp.el -lisp/net/dig.el -lisp/net/dns.el -lisp/net/eudcb-bbdb.el -lisp/net/eudcb-ldap.el -lisp/net/eudcb-mab.el -lisp/net/eudc-bob.el -lisp/net/eudcb-ph.el -lisp/net/eudc.el -lisp/net/eudc-export.el -lisp/net/eudc-hotlist.el -lisp/net/eudc-vars.el -lisp/net/eww.el -lisp/net/gnutls.el -lisp/net/goto-addr.el -lisp/net/hmac-def.el -lisp/net/hmac-md5.el -lisp/net/imap.el -lisp/net/ldap.el -lisp/net/mairix.el -lisp/net/netrc.el -lisp/net/net-utils.el -lisp/net/network-stream.el -lisp/net/nsm.el -lisp/net/ntlm.el -lisp/net/pinentry.el -lisp/net/quickurl.el -lisp/net/rcirc.el -lisp/net/rfc2104.el -lisp/net/rlogin.el -lisp/net/sasl-cram.el -lisp/net/sasl-digest.el -lisp/net/sasl.el -lisp/net/sasl-ntlm.el -lisp/net/sasl-scram-rfc.el -lisp/net/shr-color.el -lisp/net/shr.el -lisp/net/snmp-mode.el -lisp/net/soap-client.el -lisp/net/soap-inspect.el -lisp/net/socks.el -lisp/net/telnet.el -lisp/net/tls.el -lisp/net/webjump.el -lisp/newcomment.el -lisp/novice.el -lisp/nxml/* -lisp/obsolete/* -lisp/paren.el -lisp/password-cache.el -lisp/pcmpl-cvs.el -lisp/pcmpl-gnu.el -lisp/pcmpl-linux.el -lisp/pcmpl-rpm.el -lisp/pcmpl-unix.el -lisp/pcmpl-x.el -lisp/pcomplete.el -lisp/play/* -lisp/printing.el -lisp/proced.el -lisp/profiler.el -lisp/progmodes/ada-mode.el -lisp/progmodes/ada-prj.el -lisp/progmodes/ada-stmt.el -lisp/progmodes/ada-xref.el -lisp/progmodes/antlr-mode.el -lisp/progmodes/asm-mode.el -lisp/progmodes/autoconf.el -lisp/progmodes/bat-mode.el -lisp/progmodes/bug-reference.el -lisp/progmodes/cc-align.el -lisp/progmodes/cc-awk.el -lisp/progmodes/cc-bytecomp.el -lisp/progmodes/cc-cmds.el -lisp/progmodes/cc-defs.el -lisp/progmodes/cc-engine.el -lisp/progmodes/cc-fonts.el -lisp/progmodes/cc-guess.el -lisp/progmodes/cc-langs.el -lisp/progmodes/cc-menus.el -lisp/progmodes/cc-mode.el -lisp/progmodes/cc-styles.el -lisp/progmodes/cc-vars.el -lisp/progmodes/cfengine.el -lisp/progmodes/cmacexp.el -lisp/progmodes/compile.el -lisp/progmodes/cperl-mode.el -lisp/progmodes/cpp.el -lisp/progmodes/cwarn.el -lisp/progmodes/dcl-mode.el -lisp/progmodes/ebnf-abn.el -lisp/progmodes/ebnf-bnf.el -lisp/progmodes/ebnf-dtd.el -lisp/progmodes/ebnf-ebx.el -lisp/progmodes/ebnf-iso.el -lisp/progmodes/ebnf-otz.el -lisp/progmodes/ebnf-yac.el -lisp/progmodes/ebnf2ps.el -lisp/progmodes/ebrowse.el -lisp/progmodes/elisp-mode.el -lisp/progmodes/etags.el -lisp/progmodes/executable.el -lisp/progmodes/f90.el -lisp/progmodes/flymake.el -lisp/progmodes/fortran.el -lisp/progmodes/glasses.el -lisp/progmodes/grep.el -lisp/progmodes/gud.el -lisp/progmodes/hideif.el -lisp/progmodes/hideshow.el -lisp/progmodes/icon.el -lisp/progmodes/idlw-complete-structtag.el -lisp/progmodes/idlw-help.el -lisp/progmodes/idlw-shell.el -lisp/progmodes/idlw-toolbar.el -lisp/progmodes/idlwave.el -lisp/progmodes/inf-lisp.el -lisp/progmodes/js.el -lisp/progmodes/ld-script.el -lisp/progmodes/m4-mode.el -lisp/progmodes/make-mode.el -lisp/progmodes/mantemp.el -lisp/progmodes/meta-mode.el -lisp/progmodes/mixal-mode.el -lisp/progmodes/modula2.el -lisp/progmodes/octave.el -lisp/progmodes/opascal.el -lisp/progmodes/pascal.el -lisp/progmodes/prog-mode.el -lisp/progmodes/prolog.el -lisp/progmodes/ps-mode.el -lisp/progmodes/python.el -lisp/progmodes/scheme.el -lisp/progmodes/sh-script.el -lisp/progmodes/simula.el -lisp/progmodes/sql.el -lisp/progmodes/subword.el -lisp/progmodes/vera-mode.el -lisp/progmodes/verilog-mode.el -lisp/progmodes/vhdl-mode.el -lisp/progmodes/which-func.el -lisp/progmodes/xscheme.el -lisp/ps-bdf.el -lisp/ps-def.el -lisp/ps-mule.el -lisp/ps-print.el -lisp/ps-samp.el -lisp/recentf.el -lisp/rect.el -lisp/register.el -lisp/repeat.el -lisp/replace.el -lisp/reposition.el -lisp/reveal.el -lisp/rot13.el -lisp/ruler-mode.el -lisp/savehist.el -lisp/saveplace.el -lisp/sb-image.el -lisp/scroll-all.el -lisp/scroll-bar.el -lisp/scroll-lock.el -lisp/select.el -lisp/server.el -lisp/ses.el -lisp/shadowfile.el -lisp/simple.el -lisp/skeleton.el -lisp/sort.el -lisp/soundex.el -lisp/speedbar.el -lisp/strokes.el -lisp/subr.el -lisp/t-mouse.el -lisp/tabify.el -lisp/talk.el -lisp/tar-mode.el -lisp/tempo.el -lisp/term.el -lisp/term/AT386.el -lisp/term/bobcat.el -lisp/term/common-win.el -lisp/term/cygwin.el -lisp/term/iris-ansi.el -lisp/term/linux.el -lisp/term/lk201.el -lisp/term/news.el -lisp/term/ns-win.el -lisp/term/rxvt.el -lisp/term/screen.el -lisp/term/sun.el -lisp/term/tvi970.el -lisp/term/vt100.el -lisp/term/vt200.el -lisp/term/wyse50.el -lisp/term/x-win.el -lisp/term/xterm.el -lisp/textmodes/artist.el -lisp/textmodes/bib-mode.el -lisp/textmodes/bibtex-style.el -lisp/textmodes/bibtex.el -lisp/textmodes/conf-mode.el -lisp/textmodes/dns-mode.el -lisp/textmodes/enriched.el -lisp/textmodes/fill.el -lisp/textmodes/makeinfo.el -lisp/textmodes/nroff-mode.el -lisp/textmodes/page-ext.el -lisp/textmodes/page.el -lisp/textmodes/paragraphs.el -lisp/textmodes/picture.el -lisp/textmodes/po.el -lisp/textmodes/refbib.el -lisp/textmodes/refer.el -lisp/textmodes/remember.el -lisp/textmodes/rst.el -lisp/textmodes/sgml-mode.el -lisp/textmodes/table.el -lisp/textmodes/texinfmt.el -lisp/textmodes/texinfo.el -lisp/textmodes/texnfo-upd.el -lisp/textmodes/text-mode.el -lisp/textmodes/tildify.el -lisp/textmodes/two-column.el -lisp/textmodes/underline.el -lisp/thingatpt.el -lisp/thumbs.el -lisp/time-stamp.el -lisp/time.el -lisp/timezone.el -lisp/tmm.el -lisp/tool-bar.el -lisp/tooltip.el -lisp/tree-widget.el -lisp/tutorial.el -lisp/type-break.el -lisp/uniquify.el -lisp/url/* -lisp/userlock.el -lisp/vcursor.el -lisp/version.el -lisp/view.el -lisp/vt-control.el -lisp/vt100-led.el -lisp/wdired.el -lisp/wid-browse.el -lisp/wid-edit.el -lisp/widget.el -lisp/windmove.el -lisp/window.el -lisp/winner.el -lisp/woman.el -lisp/x-dnd.el -lisp/xml.el -lisp/xt-mouse.el -lwlib/* -oldXMenu/* -src/bitmaps/ -src/cygw32.c -src/cygw32.h -src/macfont.m -src/nsfns.m -src/nsfont.m -src/nsimage.m -src/nsmenu.m -src/nsselect.m -src/nsterm.m -test/automated/* -test/cedet/* -test/rmailmm.el - ;;; Local Variables: ;;; coding: utf-8 commit 8528f7c9f1c2a74d353c03dbb6911eca2eb94197 Author: Stefan Monnier Date: Tue Oct 6 22:57:53 2015 -0400 * lisp/textmodes/tex-mode.el: Use lexical-binding diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index ef9c71c..45afafc 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1,4 +1,4 @@ -;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands +;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- lexical-binding:t -*- ;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2015 Free ;; Software Foundation, Inc. @@ -368,7 +368,7 @@ An alternative value is \" . \", if you use a font with a narrow period." (match-end 1)) latex-section-alist)))) (backward-char 1) - (condition-case err + (condition-case nil (progn ;; Using sexps allows some use of matching {...} inside ;; titles. @@ -937,7 +937,7 @@ Inherits `shell-mode-map' with a few additions.") ,@tex-face-alist) "Alist of face and LaTeX font name for facemenu.") -(defun tex-facemenu-add-face-function (face end) +(defun tex-facemenu-add-face-function (face _end) (or (cdr (assq face tex-face-alist)) (or (and (consp face) (consp (car face)) @@ -1982,7 +1982,7 @@ In the tex shell buffer this command behaves like `comint-send-input'." (display-buffer (tex-shell-buf)) (tex-recenter-output-buffer nil)) -(defun tex-shell-sentinel (proc msg) +(defun tex-shell-sentinel (proc _msg) (cond ((null (buffer-name (process-buffer proc))) ;; buffer killed (set-process-buffer proc nil) @@ -2762,10 +2762,11 @@ Runs the shell command defined by `tex-show-queue-command'." st) "Syntax table used while computing indentation.") -(defun latex-indent (&optional arg) +(defun latex-indent (&optional _arg) (if (and (eq (get-text-property (if (and (eobp) (bolp)) (max (point-min) (1- (point))) - (line-beginning-position)) 'face) + (line-beginning-position)) + 'face) 'tex-verbatim)) 'noindent (with-syntax-table tex-latex-indent-syntax-table @@ -3408,7 +3409,7 @@ There might be text before point." ("\\textreferencemark" . ?※)) "A `prettify-symbols-alist' usable for (La)TeX modes.") -(defun tex--prettify-symbols-compose-p (start end _match) +(defun tex--prettify-symbols-compose-p (_start end _match) (let* ((after-char (char-after end)) (after-syntax (char-syntax after-char))) (not (or commit f54e5ccfdbe2f1aa4e6e072657659017d2cbaf86 Author: Stefan Monnier Date: Tue Oct 6 22:56:24 2015 -0400 * lisp/indent.el (indent--default-inside-comment): New function (indent-for-tab-command): Use it for `noindent' indentation. diff --git a/lisp/indent.el b/lisp/indent.el index 18c1fd4..cba8f75 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -86,6 +86,22 @@ that case, indent by aligning to the previous non-blank line." ;; The normal case. (funcall indent-line-function))) +(defun indent--default-inside-comment () + (unless (or (> (current-column) (current-indentation)) + (eq this-command last-command)) + (let ((ppss (syntax-ppss))) + (when (nth 4 ppss) + (indent-line-to + (save-excursion + (forward-line -1) + (skip-chars-forward " \t") + (when (< (1- (point)) (nth 8 ppss) (line-end-position)) + (goto-char (nth 8 ppss)) + (when (looking-at comment-start-skip) + (goto-char (match-end 0)))) + (current-column))) + t)))) + (defun indent-for-tab-command (&optional arg) "Indent the current line or region, or insert a tab, as appropriate. This function either inserts a tab, or indents the current line, @@ -124,7 +140,11 @@ prefix argument is ignored." (old-indent (current-indentation))) ;; Indent the line. - (funcall indent-line-function) + (or (not (eq (funcall indent-line-function) 'noindent)) + (indent--default-inside-comment) + (when (or (<= (current-column) (current-indentation)) + (not (eq tab-always-indent 'complete))) + (funcall (default-value 'indent-line-function)))) (cond ;; If the text was already indented right, try completion. commit 3b4d119c40817a528be5ad2bb994521a947dc443 Author: Paul Eggert Date: Tue Oct 6 13:33:50 2015 -0700 Fix bug in GC_CHECK_MARKED_OBJECTS check * src/alloc.c (mark_object): Fix bug in checking code. When GC_CHECK_MARKED_OBJECTS is defined, the bug caused CHECK_ALLOCATED_AND_LIVE_SYMBOL to repeatedly do the CHECK_ALLOCATED and CHECK_LIVE tests for the first symbol in each bucket. The bug did not affect behavior either in the normal case where GC_CHECK_MARKED_OBJECTS is not defined, or where Emacs does not have an internal error that a properly-written CHECK_ALLOCATED_AND_LIVE_SYMBOL would detect. diff --git a/src/alloc.c b/src/alloc.c index 3ab2a6e..5fc40d1 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -6217,7 +6217,7 @@ mark_object (Lisp_Object arg) MARK_STRING (XSTRING (ptr->name)); MARK_INTERVAL_TREE (string_intervals (ptr->name)); /* Inner loop to mark next symbol in this bucket, if any. */ - ptr = ptr->next; + po = ptr = ptr->next; if (ptr) goto nextsym; } commit a4a98a1b2568793ead43e824ecf227768759df12 Author: Tassilo Horn Date: Tue Oct 6 20:58:47 2015 +0200 Add prettified version of \\Bbb{Q}. * lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Add prettified version for \\Bbb{Q}. diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index cbeded2..ef9c71c 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -3375,6 +3375,7 @@ There might be text before point." ("\\wr" . ?≀) ("\\Bbb{N}" . ?ℕ) ; AMS commands for blackboard bold ("\\Bbb{P}" . ?ℙ) ; Also sometimes \mathbb. + ("\\Bbb{Q}" . ?ℚ) ("\\Bbb{R}" . ?ℝ) ("\\Bbb{Z}" . ?ℤ) ("--" . ?–) commit 11f42149b1c6d0f4805a6265b42301d04e0203fc Author: Artur Malabarba Date: Tue Oct 6 19:40:27 2015 +0100 * test/automated/package-test.el (package-test-install-single): Add a test for bug#21625. diff --git a/test/automated/package-test.el b/test/automated/package-test.el index ae10a9b..de41c3b 100644 --- a/test/automated/package-test.el +++ b/test/automated/package-test.el @@ -205,6 +205,12 @@ Must called from within a `tar-mode' buffer." (should (package-install-from-buffer)) (package-initialize) (should (package-installed-p 'simple-single)) + ;; Check if we properly report an "already installed". + (package-install 'simple-single) + (with-current-buffer "*Messages*" + (should (string-match "^[`‘']simple-single[’'] is already installed\n?\\'" + (buffer-string)))) + (should (package-installed-p 'simple-single)) (let* ((simple-pkg-dir (file-name-as-directory (expand-file-name "simple-single-1.3" commit 81558130c1f7c55d1c9c69d9a1a7ec174f9589a3 Author: Aaron Ecay Date: Mon Oct 5 20:55:58 2015 +0100 lisp/emacs-lisp/package.el (package-install): Fix name error * lisp/emacs-lisp/package.el (package-install): Fix error when pkg is not a package-desc object. Also clarify documentation. (Bug#21625) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index eb66e8f..89f2a1a 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1887,7 +1887,7 @@ add a call to it along with some explanatory comments." ;;;###autoload (defun package-install (pkg &optional dont-select) "Install the package PKG. -PKG can be a package-desc or the package name of one the available packages +PKG can be a package-desc or a symbol naming one of the available packages in an archive in `package-archives'. Interactively, prompt for its name. If called interactively or if DONT-SELECT nil, add PKG to @@ -1918,15 +1918,15 @@ to install it but still mark it as selected." pkg))) (unless (or dont-select (package--user-selected-p name)) (package--save-selected-packages - (cons name package-selected-packages)))) - (if-let ((transaction - (if (package-desc-p pkg) - (unless (package-installed-p pkg) - (package-compute-transaction (list pkg) - (package-desc-reqs pkg))) - (package-compute-transaction () (list (list pkg)))))) - (package-download-transaction transaction) - (message "`%s' is already installed" (package-desc-full-name pkg)))) + (cons name package-selected-packages))) + (if-let ((transaction + (if (package-desc-p pkg) + (unless (package-installed-p pkg) + (package-compute-transaction (list pkg) + (package-desc-reqs pkg))) + (package-compute-transaction () (list (list pkg)))))) + (package-download-transaction transaction) + (message "`%s' is already installed" name)))) (defun package-strip-rcs-id (str) "Strip RCS version ID from the version string STR. commit e2b1ad428c10b012abaa72749976732f7b584bbd Author: Eli Zaretskii Date: Tue Oct 6 19:08:21 2015 +0300 Fix display of characters adjacent to ZWJ and ZWNJ * src/bidi.c (bidi_resolve_neutral): Treat all Bn (a.k.a. "control") characters the same as directional formatting controls. (bidi_level_of_next_char): Include all Bn characters in rule L1, as mandated by the UBA. diff --git a/src/bidi.c b/src/bidi.c index 9427b81..e3b1f54 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -2948,7 +2948,7 @@ bidi_resolve_neutral (struct bidi_it *bidi_it) we are already at paragraph end. */ && (is_neutral || bidi_isolate_fmt_char (type))) /* N1-N2/Retaining */ - || (type == WEAK_BN && bidi_explicit_dir_char (bidi_it->ch))) + || type == WEAK_BN) { if (bidi_it->next_for_neutral.type != UNKNOWN_BT) { @@ -2978,6 +2978,7 @@ bidi_resolve_neutral (struct bidi_it *bidi_it) entering the expensive loop in the "else" clause. */ else if (current_level == 0 && bidi_it->prev_for_neutral.type == STRONG_L + && type != WEAK_BN && !bidi_explicit_dir_char (bidi_it->ch) && !bidi_isolate_fmt_char (type)) type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type, @@ -2991,6 +2992,7 @@ bidi_resolve_neutral (struct bidi_it *bidi_it) && (bidi_it->prev_for_neutral.type == STRONG_R || bidi_it->prev_for_neutral.type == WEAK_EN || bidi_it->prev_for_neutral.type == WEAK_AN) + && type != WEAK_BN && !bidi_explicit_dir_char (bidi_it->ch) && !bidi_isolate_fmt_char (type)) type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type, @@ -3216,6 +3218,7 @@ bidi_level_of_next_char (struct bidi_it *bidi_it) it belongs to a sequence of WS characters preceding a newline or a TAB or a paragraph separator. */ if ((bidi_it->orig_type == NEUTRAL_WS + || bidi_it->orig_type == WEAK_BN || bidi_isolate_fmt_char (bidi_it->orig_type)) && bidi_it->next_for_ws.charpos < bidi_it->charpos) { @@ -3249,11 +3252,14 @@ bidi_level_of_next_char (struct bidi_it *bidi_it) /* Resolve implicit levels. */ if (bidi_it->orig_type == NEUTRAL_B /* L1 */ - || bidi_it->orig_type == NEUTRAL_S - || bidi_it->ch == '\n' || bidi_it->ch == BIDI_EOB - || (bidi_it->orig_type == NEUTRAL_WS - && (bidi_it->next_for_ws.type == NEUTRAL_B - || bidi_it->next_for_ws.type == NEUTRAL_S))) + || bidi_it->orig_type == NEUTRAL_S + || bidi_it->ch == '\n' || bidi_it->ch == BIDI_EOB + || ((bidi_it->orig_type == NEUTRAL_WS + || bidi_it->orig_type == WEAK_BN + || bidi_isolate_fmt_char (bidi_it->orig_type) + || bidi_explicit_dir_char (bidi_it->ch)) + && (bidi_it->next_for_ws.type == NEUTRAL_B + || bidi_it->next_for_ws.type == NEUTRAL_S))) level = bidi_it->level_stack[0].level; else if ((level & 1) == 0) /* I1 */ { commit 0befeb0b7f7492103aa3902146a891fbef9e7d21 Author: Andreas Schwab Date: Tue Oct 6 11:47:07 2015 +0200 Don't use XFASTINT on a negative number * src/cmds.c (Fself_insert_command): Don't use XFASTINT on a negative number. (Bug#21633) diff --git a/src/cmds.c b/src/cmds.c index ccc6891..39c5af9 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -307,8 +307,8 @@ At the end, it runs `post-self-insert-hook'. */) { CHECK_NUMBER (n); - if (XFASTINT (n) < 0) - error ("Negative repetition argument %"pI"d", XFASTINT (n)); + if (XINT (n) < 0) + error ("Negative repetition argument %"pI"d", XINT (n)); if (XFASTINT (n) < 2) remove_excessive_undo_boundaries (); @@ -316,14 +316,15 @@ At the end, it runs `post-self-insert-hook'. */) /* Barf if the key that invoked this was not a character. */ if (!CHARACTERP (last_command_event)) bitch_at_user (); - else { - int character = translate_char (Vtranslation_table_for_input, - XINT (last_command_event)); - int val = internal_self_insert (character, XFASTINT (n)); - if (val == 2) - nonundocount = 0; - frame_make_pointer_invisible (SELECTED_FRAME ()); - } + else + { + int character = translate_char (Vtranslation_table_for_input, + XINT (last_command_event)); + int val = internal_self_insert (character, XFASTINT (n)); + if (val == 2) + nonundocount = 0; + frame_make_pointer_invisible (SELECTED_FRAME ()); + } return Qnil; }