AC_PREREQ(2.65)
dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
-AC_INIT(GNU Emacs, 25.0.92, bug-gnu-emacs@gnu.org)
+AC_INIT(GNU Emacs, 25.1.50, bug-gnu-emacs@gnu.org)
dnl Set emacs_config_options to the options of 'configure', quoted for the shell,
dnl and then quoted again for a C string. Separate options with spaces.
[Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])],
[ac_enable_gtk_deprecation_warnings="${enableval}"],[])
+BUILD_DETAILS=
+AC_ARG_ENABLE([build-details],
+ [AS_HELP_STRING([--disable-build-details],
+ [Make the build more deterministic by omitting host
+ names, time stamps, etc. from the output.])],
+ [test "$enableval" = no && BUILD_DETAILS=--no-build-details])
+AC_SUBST([BUILD_DETAILS])
+
dnl This used to use changequote, but, apart from 'changequote is evil'
dnl per the autoconf manual, we can speed up autoconf somewhat by quoting
dnl the great gob of text. Thus it's not processed for possible expansion.
* ) unported=yes ;;
esac
opsys=darwin
- ## Use fink packages if available.
- ## FIXME find a better way to do this: http://debbugs.gnu.org/11507
-## if test -d /sw/include && test -d /sw/lib; then
-## GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
-## NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
-## fi
+ ## FIXME: Find a way to use Fink if available (Bug#11507).
;;
## Chromium Native Client
opsys=aix4-2
;;
- ## Silicon Graphics machines
- ## Iris 4D
- mips-sgi-irix6.5 )
- opsys=irix6-5
- # Without defining _LANGUAGE_C, things get masked out in the headers
- # so that, for instance, grepping for 'free' in stdlib.h fails and
- # AC_HEADER_STD_C fails. (MIPSPro 7.2.1.2m compilers, Irix 6.5.3m).
- NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C"
- ;;
-
## Suns
*-sun-solaris* \
| i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
if test x$GCC = xyes; then
test "x$GCC_TEST_OPTIONS" != x && CC="$CC $GCC_TEST_OPTIONS"
-else
- test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS"
fi
dnl This is used in lib/Makefile.am to use nt/gnulib.mk, the
# When compiling with GCC, prefer -isystem to -I when including system
# include files, to avoid generating useless diagnostics for the files.
- if test "$gl_gcc_warnings" != yes; then
+ AS_IF([test "$gl_gcc_warnings" != yes],
+ [
isystem='-I'
- if test "$emacs_cv_clang" = yes
- then
+ AS_IF([test "$emacs_cv_clang" = yes],
+ [
# Turn off some warnings if supported.
gl_WARN_ADD([-Wno-switch])
gl_WARN_ADD([-Wno-tautological-constant-out-of-range-compare])
gl_WARN_ADD([-Wno-pointer-sign])
gl_WARN_ADD([-Wno-string-plus-int])
gl_WARN_ADD([-Wno-unknown-attributes])
- fi
- else
+ ])
+ ],[
isystem='-isystem '
# This, $nw, is the list of warnings we disable.
# Old toolkits mishandle 'const'.
nw="$nw -Wwrite-strings"
;;
- *)
- gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
- ;;
esac
+ AS_IF([test -z "$nw"],
+ [gl_WARN_ADD([-Werror], [WERROR_CFLAGS])])
AC_SUBST([WERROR_CFLAGS])
nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
nw="$nw -Wvla" # Emacs uses <vla.h>.
nw="$nw -Wswitch-default" # Too many warnings for now
nw="$nw -Winline" # OK to ignore 'inline'
- nw="$nw -Wjump-misses-init" # We sometimes safely jump over init.
nw="$nw -Wstrict-overflow" # OK to optimize assuming that
# signed overflow has undefined behavior
nw="$nw -Wsync-nand" # irrelevant here, and provokes ObjC warning
gl_MANYWARN_COMPLEMENT([GNULIB_WARN_CFLAGS], [$WARN_CFLAGS], [$nw])
AC_SUBST([GNULIB_WARN_CFLAGS])
- fi
+ ])
edit_cflags="
s,///*,/,g
dnl We need -znocombreloc if we're using a relatively recent GNU ld.
dnl If we can link with the flag, it shouldn't do any harm anyhow.
-dnl (Don't use '-z nocombreloc' as -z takes no arg on Irix.)
dnl Treat GCC specially since it just gives a non-fatal 'unrecognized option'
dnl if not built to support GNU ld.
dnl Current possibilities handled by sed (aix4-2 -> aix,
dnl gnu-linux -> gnu/linux, etc.):
-dnl gnu, gnu/linux, gnu/kfreebsd, aix, cygwin, darwin, hpux, irix.
+dnl gnu, gnu/linux, gnu/kfreebsd, aix, cygwin, darwin, hpux.
dnl And special cases: berkeley-unix, usg-unix-v, ms-dos, windows-nt.
SYSTEM_TYPE=`echo $opsys | sed -e 's/[[0-9]].*//' -e 's|-|/|'`
dnl checks for header files
AC_CHECK_HEADERS_ONCE(
+ malloc.h
sys/systeminfo.h
sys/sysinfo.h
coff.h pty.h
cygwin) hybrid_malloc=yes;;
esac
+if test "${system_malloc}" != yes && test "${doug_lea_malloc}" != yes \
+ && test "${UNEXEC_OBJ}" = unexelf.o; then
+ hybrid_malloc=yes
+fi
+
GMALLOC_OBJ=
+HYBRID_MALLOC=
if test "${system_malloc}" = "yes"; then
AC_DEFINE([SYSTEM_MALLOC], 1,
[Define to 1 to use the system memory allocator, even if it is not
elif test "$hybrid_malloc" = yes; then
AC_DEFINE(HYBRID_MALLOC, 1,
[Define to use gmalloc before dumping and the system malloc after.])
+ HYBRID_MALLOC=1
GNU_MALLOC=
GNU_MALLOC_reason="only before dumping"
GMALLOC_OBJ=gmalloc.o
of the main data segment.])
fi
fi
+AC_SUBST([HYBRID_MALLOC])
+AM_CONDITIONAL([HYBRID_MALLOC_LIB], [test -n "$HYBRID_MALLOC"])
AC_SUBST(GMALLOC_OBJ)
AC_SUBST(VMLIMIT_OBJ)
-if test "$doug_lea_malloc" = "yes" ; then
+if test "$doug_lea_malloc" = "yes" && test "$hybrid_malloc" != yes; then
if test "$GNU_MALLOC" = yes ; then
GNU_MALLOC_reason="
(Using Doug Lea's new malloc from the GNU C Library.)"
use_mmap_for_buffers=no
case "$opsys" in
- cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+ cygwin|mingw32) use_mmap_for_buffers=yes ;;
esac
AC_FUNC_MMAP
OLD_LIBS=$LIBS
CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS"
LIBS="$IMAGEMAGICK_LIBS $LIBS"
- AC_CHECK_FUNCS(MagickExportImagePixels MagickMergeImageLayers)
+ AC_CHECK_FUNCS(MagickExportImagePixels MagickMergeImageLayers MagickAutoOrientImage)
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
fi
fi
fi
+AC_CHECK_LIB(anl, getaddrinfo_a, HAVE_GETADDRINFO_A=yes)
+if test "${HAVE_GETADDRINFO_A}" = "yes"; then
+ AC_DEFINE(HAVE_GETADDRINFO_A, 1,
+[Define to 1 if you have getaddrinfo_a for asynchronous DNS resolution.])
+ GETADDRINFO_A_LIBS="-lanl"
+ AC_SUBST(GETADDRINFO_A_LIBS)
+fi
HAVE_GTK=no
GTK_OBJ=
AC_SUBST(LIBXML2_LIBS)
AC_SUBST(LIBXML2_CFLAGS)
-# If netdb.h doesn't declare h_errno, we must declare it by hand.
-# On MinGW, that is provided by nt/inc/sys/socket.h and w32.c.
-if test "${opsys}" = "mingw32"; then
- emacs_cv_netdb_declares_h_errno=yes
-fi
-AC_CACHE_CHECK(whether netdb declares h_errno,
- emacs_cv_netdb_declares_h_errno,
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
- [[return h_errno;]])],
- emacs_cv_netdb_declares_h_errno=yes, emacs_cv_netdb_declares_h_errno=no)])
-if test $emacs_cv_netdb_declares_h_errno = yes; then
- AC_DEFINE(HAVE_H_ERRNO, 1, [Define to 1 if netdb.h declares h_errno.])
-fi
-
# Check for mail-locking functions in a "mail" library. Probably this should
# have the same check as for liblockfile below.
AC_CHECK_LIB(mail, maillock, have_mail=yes, have_mail=no)
case "$opsys" in
aix4-2) mail_lock="lockf" ;;
- gnu|freebsd|dragonfly|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
+ gnu|freebsd|dragonfly|netbsd|openbsd|darwin) mail_lock="flock" ;;
## On GNU/Linux systems, both methods are used by various mail programs.
## I assume most people are using newer mailers that have heard of flock.
getrusage get_current_dir_name \
lrand48 random rint \
select getpagesize setlocale newlocale \
-getrlimit setrlimit shutdown getaddrinfo \
+getrlimit setrlimit shutdown \
pthread_sigmask strsignal setitimer \
sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
gai_strerror sync \
dnl No need to check for posix_memalign if aligned_alloc works.
AC_CHECK_FUNCS([aligned_alloc posix_memalign], [break])
+AC_CHECK_DECLS([aligned_alloc], [], [], [[#include <stdlib.h>]])
dnl Cannot use AC_CHECK_FUNCS
AC_CACHE_CHECK([for __builtin_unwind_init],
[emacs_cv_alternate_stack=yes],
[emacs_cv_alternate_stack=no])])
-# Do we have res_init, for detecting changes in /etc/resolv.conf?
-# On Darwin, res_init appears not to be useful: see bug#562 and
-# http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01467.html
-resolv=no
-
-if test $opsys != darwin; then
-
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>]],
- [[return res_init();]])],
- have_res_init=yes, have_res_init=no)
- if test "$have_res_init" = no; then
- OLIBS="$LIBS"
- LIBS="$LIBS -lresolv"
- AC_MSG_CHECKING(for res_init with -lresolv)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>]],
- [[return res_init();]])],
- have_res_init=yes, have_res_init=no)
- AC_MSG_RESULT($have_res_init)
- if test "$have_res_init" = yes ; then
- resolv=yes
- fi
- LIBS="$OLIBS"
- fi
-
- if test "$have_res_init" = yes; then
- AC_DEFINE(HAVE_RES_INIT, 1, [Define to 1 if res_init is available.])
- fi
-fi dnl !darwin
-
# Do we need the Hesiod library to provide the support routines?
dnl FIXME? Should we be skipping this on Darwin too?
LIBHESIOD=
+LIBRESOLV=
if test "$with_hesiod" != no ; then
# Don't set $LIBS here -- see comments above. FIXME which comments?
+ resolv=no
AC_CHECK_FUNC(res_send, , [AC_CHECK_FUNC(__res_send, ,
[AC_CHECK_LIB(resolv, res_send, resolv=yes,
[AC_CHECK_LIB(resolv, __res_send, resolv=yes)])])])
else
RESOLVLIB=
fi
+ hesiod=no
AC_CHECK_FUNC(hes_getmailhost, , [AC_CHECK_LIB(hesiod, hes_getmailhost,
hesiod=yes, :, $RESOLVLIB)])
if test x"$hesiod" = xyes; then
LIBHESIOD=-lhesiod
+ LIBRESOLV=$RESOLVLIB
fi
fi
AC_SUBST(LIBHESIOD)
-
-# Do we need libresolv (due to res_init or Hesiod)?
-if test "$resolv" = yes && test $opsys != darwin; then
- LIBRESOLV=-lresolv
-else
- LIBRESOLV=
-fi
AC_SUBST(LIBRESOLV)
# These tell us which Kerberos-related libraries to use.
SEPCHAR=':'
fi
AC_DEFINE_UNQUOTED(SEPCHAR, ['$SEPCHAR'], [Character that separates PATH elements.])
-dnl This is for MinGW, and is used in test/automated/Makefile.in.
+dnl This is for MinGW, and is used in test/Makefile.in.
dnl The MSYS Bash has heuristics for replacing ':' with ';' when it
dnl decides that a command-line argument to be passed to a MinGW program
dnl is a PATH-style list of directories. But that heuristics plays it
case $opsys in
- irix6-5 | sol2* | unixware )
+ sol2* | unixware )
dnl Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
dnl instead, there's a system variable _sys_nsig. Unfortunately, we
dnl need the constant to dimension an array. So wire in the appropriate
case $opsys in
dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
- hpux* | irix6-5 | nacl | openbsd | sol2* | unixware )
+ hpux* | nacl | openbsd | sol2* | unixware )
emacs_broken_SIGIO=yes
;;
dnl NARROWPROTO, we will see the wrong function prototypes for X functions
dnl taking float or double parameters.
case $opsys in
- cygwin|gnu|gnu-linux|gnu-kfreebsd|irix6-5|freebsd|netbsd|openbsd)
+ cygwin|gnu|gnu-linux|gnu-kfreebsd|freebsd|netbsd|openbsd)
AC_DEFINE(NARROWPROTO, 1, [Define if system's imake configuration
file defines 'NeedWidePrototypes' as 'NO'.])
;;
dnl Used in process.c, this must be a loop, even if it only runs once.
-dnl (Except on SGI; see below. Take that, clarity and consistency!)
AH_TEMPLATE(PTY_ITERATION, [How to iterate over PTYs.])
dnl Only used if !PTY_ITERATION. Iterate from FIRST_PTY_LETTER to z,
dnl trying suffixes 0-16.
AC_DEFINE(PTY_TTY_NAME_SPRINTF, [sprintf (pty_name, "/dev/pty/tty%c%x", c, i);])
;;
- irix6-5 )
- dnl It looks like this cannot be right, because it is not a loop.
- dnl However, process.c actually does this:
- dnl # ifndef __sgi
- dnl continue;
- dnl # else
- dnl return -1;
- dnl # endif
- dnl which presumably makes it OK, since irix == sgi (?).
- dnl FIXME it seems like this special treatment is unnecessary?
- dnl Why can't irix use a single-trip loop like eg cygwin?
- AC_DEFINE(PTY_ITERATION, [])
- dnl Not used, because PTY_ITERATION is defined.
- AC_DEFINE(FIRST_PTY_LETTER, ['q'])
- AC_DEFINE(PTY_OPEN, [ { struct sigaction ocstat, cstat; struct stat stb; char * name; sigemptyset(&cstat.sa_mask); cstat.sa_handler = SIG_DFL; cstat.sa_flags = 0; sigaction(SIGCHLD, &cstat, &ocstat); name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); sigaction(SIGCHLD, &ocstat, (struct sigaction *)0); if (name == 0) return -1; if (fd < 0) return -1; if (fstat (fd, &stb) < 0) return -1; strcpy (pty_name, name); }])
- dnl No need to get the pty name at all.
- AC_DEFINE(PTY_NAME_SPRINTF, [])
- dnl No need to use sprintf to get the tty name--we get that from _getpty.
- AC_DEFINE(PTY_TTY_NAME_SPRINTF, [])
- ;;
-
sol2* )
dnl On SysVr4, grantpt(3) forks a subprocess, so do not use
dnl O_CLOEXEC when opening the pty, and keep the SIGCHLD handler
case $opsys in
dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX.
- dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX.
- aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin )
+ aix4-2 | cygwin | gnu | dragonfly | freebsd | netbsd | openbsd | darwin )
AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
;;
AC_DEFINE(GC_SETJMP_WORKS, 1)
else
case $opsys in
- dnl irix: Tested on Irix 6.5. SCM worked on earlier versions.
- aix* | dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
+ aix* | dragonfly | freebsd | netbsd | openbsd | sol2* )
AC_DEFINE(GC_SETJMP_WORKS, 1)
;;
esac
AC_DEFINE(HPUX, [], [Define if the system is HPUX.])
;;
- irix6-5)
- AC_DEFINE(USG, [])
- AC_DEFINE(USG5_4, [])
- AC_DEFINE(IRIX6_5, [], [Define if the system is IRIX.])
- ;;
-
mingw32)
AC_DEFINE(DOS_NT, [])
AC_DEFINE(WINDOWSNT, 1, [Define if compiling for native MS Windows.])
reopen it in the child.])
;;
- irix6-5)
- AC_DEFINE(PREFER_VSUSP, 1, [Define if process_send_signal should
- use VSUSP instead of VSWTCH.])
- ;;
-
sol2-10)
AC_DEFINE(_STRUCTURED_PROC, 1, [Needed for system_process_attributes
on Solaris.])
AC_SUBST(RALLOC_OBJ)
if test "$opsys" = "cygwin"; then
- CYGWIN_OBJ="sheap.o cygw32.o"
+ CYGWIN_OBJ="cygw32.o"
## Cygwin differs because of its unexec().
PRE_ALLOC_OBJ=
POST_ALLOC_OBJ=lastfile.o
leim/Makefile nextstep/Makefile nt/Makefile])
dnl test/ is not present in release tarfiles.
-opt_makefile=test/automated/Makefile
+opt_makefile=test/Makefile
if test -f "$srcdir/$opt_makefile.in"; then
SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
dnl Again, it's best not to use a variable. Though you can add
dnl ", [], [opt_makefile='$opt_makefile']" and it should work.
- AC_CONFIG_FILES([test/automated/Makefile])
+ AC_CONFIG_FILES([test/Makefile])
fi
@findex vc-dir-mark
@findex vc-dir-mark-all-files
While in the VC Directory buffer, all the files that you mark with
- @kbd{m} (@code{vc-dir-mark}) or @kbd{M} (@code{vc-dir-mark}) are in
- the current VC fileset. If you mark a directory entry with @kbd{m},
- all the listed files in that directory tree are in the current VC
- fileset. The files and directories that belong to the current VC
- fileset are indicated with a @samp{*} character in the VC Directory
- buffer, next to their VC status. In this way, you can set up a
- multi-file VC fileset to be acted on by VC commands like @w{@kbd{C-x v
- v}} (@pxref{Basic VC Editing}), @w{@kbd{C-x v =}} (@pxref{Old
- Revisions}), and @w{@kbd{C-x v u}} (@pxref{VC Undo}).
+ @kbd{m} (@code{vc-dir-mark}) or @kbd{M} (@code{vc-dir-mark-all-files})
+ are in the current VC fileset. If you mark a directory entry with
+ @kbd{m}, all the listed files in that directory tree are in the
+ current VC fileset. The files and directories that belong to the
+ current VC fileset are indicated with a @samp{*} character in the VC
+ Directory buffer, next to their VC status. In this way, you can set
+ up a multi-file VC fileset to be acted on by VC commands like
+ @w{@kbd{C-x v v}} (@pxref{Basic VC Editing}), @w{@kbd{C-x v =}}
+ (@pxref{Old Revisions}), and @w{@kbd{C-x v u}} (@pxref{VC Undo}).
The VC Directory buffer also defines some single-key shortcuts for
VC commands with the @kbd{C-x v} prefix: @kbd{=}, @kbd{+}, @kbd{l},
can even guess the name of the function or other object that was
changed.
+@c Not worth it.
+@c @vindex change-log-directory-files
+To find the change log file, Emacs searches up the directory tree from
+the file you are editing. By default, it stops if it finds a
+directory that seems to be the root of a version-control repository.
+To change this, customize @code{change-log-directory-files}.
+
@vindex add-log-keep-changes-together
When the variable @code{add-log-keep-changes-together} is
non-@code{nil}, @kbd{C-x 4 a} adds to any existing item for the file
The @file{seq.el} library can be extended to work with additional
types of sequential data-structures. For that purpose, all functions
- are defined using @code{cl-defgeneric}.
+ are defined using @code{cl-defgeneric}. @xref{Generic Functions}, for
+ more details about using @code{cl-defgeneric} for adding extensions.
@defun seq-elt sequence index
- This function the element at the index @var{index} in
- @var{sequence}. @var{index} can be an integer from zero up to the
- length of @var{sequence} minus one. For out-of-range values on
- built-in sequence types, @code{seq-elt} behaves like @code{elt}.
- @xref{Definition of elt}.
+ This function returns the element of @var{sequence} at the specified
+ @var{index}, which is an integer whose valid value range is zero to
+ one less than the length of @var{sequence}. For out-of-range values
+ on built-in sequence types, @code{seq-elt} behaves like @code{elt}.
+ For the details, see @ref{Definition of elt}.
@example
@group
(seq-elt [1 2 3 4] 2)
@result{} 3
@end group
+ @end example
- @code{seq-elt} returns settable places using @code{setf}.
+ @code{seq-elt} returns places settable using @code{setf}
+ (@pxref{Setting Generalized Variables}).
+ @example
@group
(setq vec [1 2 3 4])
(setf (seq-elt vec 2) 5)
@defun seq-do function sequence
This function applies @var{function} to each element of
- @var{sequence} in turn (presumably for side effects) and returns
+ @var{sequence} in turn (presumably for side effects), and returns
@var{sequence}.
@end defun
@end example
@end defun
+@defun seq-map-indexed function sequence
+ This function returns the result of applying @var{function} to each
+element of @var{sequence} and its index within @var{seq}. The
+returned value is a list.
+
+@example
+@group
+(seq-map-indexed (lambda (elt idx)
+ (list idx elt))
+ '(a b c))
+@result{} ((0 a) (b 1) (c 2))
+@end group
+@end example
+@end defun
+
@defun seq-mapn function &rest sequences
This function returns the result of applying @var{function} to each
- element of @var{sequences}. The arity of @var{function} must match
- the number of sequences. Mapping stops at the shortest sequence, and
- the returned value is a list.
+ element of @var{sequences}. The arity (@pxref{What Is a Function,
+ sub-arity}) of @var{function} must match the number of sequences.
+ Mapping stops at the end of the shortest sequence, and the returned
+ value is a list.
@example
@group
@end defun
@defun seq-find predicate sequence &optional default
- This function returns the first element for which @var{predicate}
- returns non-@code{nil} in @var{sequence}. If no element matches
- @var{predicate}, @var{default} is returned.
+ This function returns the first element in @var{sequence} for which
+ @var{predicate} returns non-@code{nil}. If no element matches
+ @var{predicate}, the function returns @var{default}.
Note that this function has an ambiguity if the found element is
- identical to @var{default}, as it cannot be known if an element was
- found or not.
+ identical to @var{default}, as in that case it cannot be known whether
+ an element was found or not.
@example
@group
This function returns a list of the elements of @var{sequence}
grouped into sub-sequences of length @var{n}. The last sequence may
contain less elements than @var{n}. @var{n} must be an integer. If
- @var{n} is a negative integer or 0, nil is returned.
+ @var{n} is a negative integer or 0, the return value is @code{nil}.
@example
@group
@end defun
@defun seq-min sequence
- This function returns the smallest element of
- @var{sequence}. @var{sequence} must be a sequence of numbers or
- markers.
+ This function returns the smallest element of @var{sequence}. The
+ elements of @var{sequence} must be numbers or markers
+ (@pxref{Markers}).
@example
@group
@end defun
@defun seq-max sequence
- This function returns the largest element of
- @var{sequence}. @var{sequence} must be a sequence of numbers or
- markers.
+ This function returns the largest element of @var{sequence}. The
+ elements of @var{sequence} must be numbers or markers.
@example
@group
@defmac seq-doseq (var sequence) body@dots{}
@cindex sequence iteration
- This macro is like @code{dolist}, except that @var{sequence} can be a list,
- vector or string (@pxref{Iteration} for more information about the
- @code{dolist} macro). This is primarily useful for side-effects.
+ This macro is like @code{dolist} (@pxref{Iteration, dolist}), except
+ that @var{sequence} can be a list, vector or string. This is
+ primarily useful for side-effects.
@end defmac
@defmac seq-let arguments sequence body@dots{}
@cindex sequence destructuring
This macro binds the variables defined in @var{arguments} to the
- elements of the sequence @var{sequence}. @var{arguments} can itself
- include sequences allowing for nested destructuring.
+ elements of @var{sequence}. @var{arguments} can themselves include
+ sequences, allowing for nested destructuring.
The @var{arguments} sequence can also include the @code{&rest} marker
followed by a variable name to be bound to the rest of
See files NEWS.24, NEWS.23, NEWS.22, NEWS.21, NEWS.20, NEWS.19, NEWS.18,
and NEWS.1-17 for changes in older Emacs versions.
- You can narrow news to a specific version by calling `view-emacs-news'
+ You can narrow news to a specific version by calling 'view-emacs-news'
with a prefix argument or by typing C-u C-h C-n.
Temporary note:
When you add a new item, use the appropriate mark if you are sure it applies,
otherwise leave it unmarked.
- ** New configure option ‘--disable-build-details’ attempts to build an
+\f
+* Installation Changes in Emacs 25.2
+
++++
- ** A number of accessors for the value returned by `file-attributes'
- has been added. They are: `file-attribute-type',
- `file-attribute-link-number', `file-attribute-user-id',
- `file-attribute-group-id', `file-attribute-access-time',
- `file-attribute-modification-time',
- `file-attribute-status-change-time', `file-attribute-size',
- `file-attribute-modes', `file-attribute-inode-number', and
- `file-attribute-device-number'
++** New configure option '--disable-build-details' attempts to build an
+Emacs that is more likely to be reproducible; that is, if you build
+and install Emacs twice, the second Emacs is a copy of the first.
+Deterministic builds omit the build date from the output of the
+emacs-version and erc-cmd-SV functions, and the leave the following
+variables nil: emacs-build-system, emacs-build-time,
+erc-emacs-build-time.
+
+** Emacs no longer works on IRIX. We expect that Emacs users are not
+affected by this, as SGI stopped supporting IRIX in December 2013.
+
+\f
+* Startup Changes in Emacs 25.2
+
+\f
+* Changes in Emacs 25.2
+
++++
- ** The locale language name `ca' is now mapped to the language
- environment `Catalan', which has been added.
++** A number of accessors for the value returned by 'file-attributes'
++has been added. They are: 'file-attribute-type',
++'file-attribute-link-number', 'file-attribute-user-id',
++'file-attribute-group-id', 'file-attribute-access-time',
++'file-attribute-modification-time',
++'file-attribute-status-change-time', 'file-attribute-size',
++'file-attribute-modes', 'file-attribute-inode-number', and
++'file-attribute-device-number'
+
+---
- ** `align-regexp' has a separate history for its interactive argument
- `align-regexp' no longer shares its history with all other
- history-less functions that use `read-string'
++** The locale language name 'ca' is now mapped to the language
++environment 'Catalan', which has been added.
+
+---
- `make-network-process'). How asynchronous it is varies based on the
++** 'align-regexp' has a separate history for its interactive argument
++'align-regexp' no longer shares its history with all other
++history-less functions that use 'read-string'
+
++++
+** The networking code has been reworked so that it's more
+asynchronous than it was (when specifying :nowait t in
- Certain process oriented functions (like `process-datagram-address')
++'make-network-process'). How asynchronous it is varies based on the
+capabilities of the system, but on a typical GNU/Linux system the DNS
+resolution, the connection, and (for TLS streams) the TLS negotiation
+are all done without blocking the main Emacs thread. To get
+asynchronous TLS, the TLS boot parameters have to be passed in (see
+the manual for details).
+
- ** ‘make-network-process’ and ‘open-network-stream’ sometimes allowed
++Certain process oriented functions (like 'process-datagram-address')
+will block until socket setup has been performed. The recommended way
+to deal with asynchronous sockets is to avoid interacting with them
+until they have changed status to "run". This is most easily done
+from a process sentinel.
+
- fatal signal. `attempt-stack-overflow-recovery', if set to `nil',
++** 'make-network-process' and 'open-network-stream' sometimes allowed
+:service to be an integer string (e.g., :service "993") and sometimes
+required an integer (e.g., :service 993). This difference has been
+eliminated, and integer strings work everywhere.
+
+** It is possible to disable attempted recovery on fatal signals
+
+Two new variables allow to disable attempts to recover from stack
+overflow and to avoid automatic auto-save when Emacs is delivered a
- `attempt-orderly-shutdown-on-fatal-signal', if set to `nil', will
++fatal signal. 'attempt-stack-overflow-recovery', if set to 'nil',
+will disable attempts to recover from C stack overflows; Emacs will
+then crash as with any other fatal signal.
- terminate immediately. Both variables are non-`nil' by default.
++'attempt-orderly-shutdown-on-fatal-signal', if set to 'nil', will
+disable attempts to auto-save the session and shut down in an orderly
+fashion when Emacs receives a fatal signal; instead, Emacs will
- *** A new `s' command for switching to another eww buffer via the minibuffer.
++terminate immediately. Both variables are non-'nil' by default.
+These variables are for users who would like to avoid the small
+probability of data corruption due to techniques Emacs uses to recover
+in these situations.
+
+\f
+* Editing Changes in Emacs 25.2
+
+\f
+* Changes in Specialized Modes and Packages in Emacs 25.2
+
+** eww
+
++++
- *** The `o' command (`shr-save-contents') has moved to `O' to avoid collision
- with the `o' command from `image-map'.
++*** A new 's' command for switching to another eww buffer via the minibuffer.
+
+---
- `change-log-directory-files' to nil for the old behavior.
++*** The 'o' command ('shr-save-contents') has moved to 'O' to avoid collision
++with the 'o' command from 'image-map'.
+
++++
+** The commands that add ChangeLog entries now prefer a VCS root directory
+for the ChangeLog file, if none already exists. Customize
- ** Support for non-string values of `time-stamp-format' has been removed.
++'change-log-directory-files' to nil for the old behavior.
+
+---
- ** `auto-revert-use-notify' is set back to t in `global-auto-revert-mode'.
++** Support for non-string values of 'time-stamp-format' has been removed.
+
+** Tramp
+
++++
+*** New connection method "sg", which allows to edit files under
+different group ID.
+
++++
+*** New connection method "doas" for OpenBSD hosts.
+
+---
- ** Resizing a frame no longer runs `window-configuration-change-hook'.
- Put your function on `window-size-change-functions' instead.
++** 'auto-revert-use-notify' is set back to t in 'global-auto-revert-mode'.
+
+\f
+* New Modes and Packages in Emacs 25.2
+
+\f
+* Incompatible Lisp Changes in Emacs 25.2
+
++++
- by setting `autoload-timestamps' to nil.
++** Resizing a frame no longer runs 'window-configuration-change-hook'.
++Put your function on 'window-size-change-functions' instead.
+
+\f
+* Lisp Changes in Emacs 25.2
+
+** New var syntax-ppss-table to control the syntax-table used in syntax-ppss
+
+** Autoload files can be generated without timestamps,
- ** `ert-with-function-mocked' of 'ert-x package allows mocking of functions
++by setting 'autoload-timestamps' to nil.
+FIXME As an experiment, nil is the current default.
+If no insurmountable problems before next release, it can stay that way.
+
- ** `gnutls-boot' now takes a parameter :complete-negotiation that says
++** 'ert-with-function-mocked' of 'ert-x package allows mocking of functions
+in unit tests.
+
+---
- ** New functions `window-pixel-width-before-size-change' and
- `window-pixel-height-before-size-change' allow to detect which window
- changed size when `window-size-change-functions' are run.
++** 'gnutls-boot' now takes a parameter :complete-negotiation that says
+that negotiation should complete even on non-blocking sockets.
+
++++
- ** New function `display-buffer-reuse-mode-window' is an action function
- suitable for use in `display-buffer-alist'. For example, to avoid creating
++** New functions 'window-pixel-width-before-size-change' and
++'window-pixel-height-before-size-change' allow to detect which window
++changed size when 'window-size-change-functions' are run.
+
++++
- '("\\`\\*Man .*\\*\\'" .
++** New function 'display-buffer-reuse-mode-window' is an action function
++suitable for use in 'display-buffer-alist'. For example, to avoid creating
+a new window when opening man pages when there's already one, use
+(add-to-list 'display-buffer-alist
- ** `parse-partial-sexp' state has a new element. Element 10 is
++ '("\\'\\*Man .*\\*\\'" .
+ (display-buffer-reuse-mode-window
+ (inhibit-same-window . nil)
+ (mode . Man-mode))))
+
++++
- ** `parse-partial-sexp''s state, element 9, has now been confirmed as
++** 'parse-partial-sexp' state has a new element. Element 10 is
+non-nil when the last character scanned might be the first character
+of a two character construct, i.e. a comment delimiter or escaped
+character. Its value is the syntax of that last character.
+
++++
- system. This makes the `w32-register-hot-key' functionality work
++** 'parse-partial-sexp''s state, element 9, has now been confirmed as
+permanent and documented, and may be used by Lisp programs. Its value
+is a list of currently open parenthesis positions, starting with the
+outermost parenthesis.
+
+\f
+* Changes in Emacs 25.2 on Non-Free Operating Systems
+
+** Intercepting hotkeys on Windows 7 and later now works better.
+The new keyboard hooking code properly grabs system hotkeys such as
+Win-* and Alt-TAB, in a way that Emacs can get at them before the
++system. This makes the 'w32-register-hot-key' functionality work
+again on all versions of MS-Windows starting with Windows 7. On
+Windows NT and later you can now register any hotkey combination. (On
+Windows 9X, the previous limitations, spelled out in the Emacs manual,
+still apply.)
+
\f
* Installation Changes in Emacs 25.1
be installed setgid. The option now defaults to the 'games' group.
---
- ** The `grep-changelog' script (and its manual page) are no longer included.
+ ** The 'grep-changelog' script (and its manual page) are no longer included.
It has no particular connection to Emacs and has not changed in years,
so if you want to use it, you can always take a copy from an older Emacs.
---
** Emacs 25 comes with a new set of icons.
Various resolutions are available as etc/images/icons/hicolor/*/apps/emacs.png.
- The old Emacs logo icons are available as `emacs23.png' in the same location.
+ The old Emacs logo icons are available as 'emacs23.png' in the same location.
---
- ** New make target `check-expensive' to run additional tests.
+ ** New make target 'check-expensive' to run additional tests.
This includes all tests which run via "make check", plus additional
tests which take more time to perform.
+++
** When Emacs is given a file as a command line argument and
- `initial-buffer-choice' is non-nil, display both the file and
- `initial-buffer-choice'. When Emacs is given more than one file and
- `initial-buffer-choice' is non-nil, show `initial-buffer-choice'
+ 'initial-buffer-choice' is non-nil, display both the file and
+ 'initial-buffer-choice'. When Emacs is given more than one file and
+ 'initial-buffer-choice' is non-nil, show 'initial-buffer-choice'
and *Buffer List*. This makes Emacs convenient to use from the
- command line when `initial-buffer-choice' is non-nil.
+ command line when 'initial-buffer-choice' is non-nil.
+++
- ** The value of ‘initial-scratch-message’ is now treated as a doc string
+ ** The value of 'initial-scratch-message' is now treated as a doc string
and can contain escape sequences for command keys, quotes, and the like.
\f
+++
** Xwidgets: a new feature for embedding native widgets inside Emacs buffers.
If you have gtk3 and webkitgtk3 installed, and Emacs was built with
- xwidget support, you can access the embedded webkit browser with `M-x
+ xwidget support, you can access the embedded webkit browser with 'M-x
xwidget-webkit-browse-url'. This opens a new buffer with the embedded
- browser. The buffer will have a new mode, `xwidget-webkit-mode'
- (similar to `image-mode'), which supports the webkit widget.
+ browser. The buffer will have a new mode, 'xwidget-webkit-mode'
+ (similar to 'image-mode'), which supports the webkit widget.
+++
- *** New functions for xwidget-webkit mode `xwidget-webkit-insert-string',
- `xwidget-webkit-adjust-size-dispatch', `xwidget-webkit-back',
- `xwidget-webkit-browse-url', `xwidget-webkit-reload',
- `xwidget-webkit-current-url', `xwidget-webkit-scroll-backward',
- `xwidget-webkit-scroll-forward', `xwidget-webkit-scroll-down',
- `xwidget-webkit-scroll-up'.
+ *** New functions for xwidget-webkit mode 'xwidget-webkit-insert-string',
+ 'xwidget-webkit-adjust-size-dispatch', 'xwidget-webkit-back',
+ 'xwidget-webkit-browse-url', 'xwidget-webkit-reload',
+ 'xwidget-webkit-current-url', 'xwidget-webkit-scroll-backward',
+ 'xwidget-webkit-scroll-forward', 'xwidget-webkit-scroll-down',
+ 'xwidget-webkit-scroll-up'.
+++
** Emacs can now load shared/dynamic libraries (modules).
A dynamic Emacs module is a shared library that provides additional
functionality for use in Emacs Lisp programs, just like a package
- written in Emacs Lisp would. The functions `load', `require',
- `load-file', etc. were extended to load such modules, as they do with
- Emacs Lisp packages. The new variable `module-file-suffix' holds the
- system-dependent value of the file-name extension (`.so' on Posix
+ written in Emacs Lisp would. The functions 'load', 'require',
+ 'load-file', etc. were extended to load such modules, as they do with
+ Emacs Lisp packages. The new variable 'module-file-suffix' holds the
+ system-dependent value of the file-name extension ('.so' on Posix
hosts) of the module files.
A module should export a C-callable function named
- `emacs_module_init', which Emacs will call as part of the call to
- `load' or `require' which loads the module. It should also export a
- symbol named `plugin_is_GPL_compatible' to indicate that its code is
+ 'emacs_module_init', which Emacs will call as part of the call to
+ 'load' or 'require' which loads the module. It should also export a
+ symbol named 'plugin_is_GPL_compatible' to indicate that its code is
released under the GPL or compatible license; Emacs will refuse to
load modules that don't export such a symbol.
If a module needs to call Emacs functions, it should do so through the
- API defined and documented in the header file `emacs-module.h'. Note
+ API defined and documented in the header file 'emacs-module.h'. Note
that any module that provides Lisp-callable functions will have to use
- Emacs functions such as `fset' and `funcall', in order to register its
+ Emacs functions such as 'fset' and 'funcall', in order to register its
functions with the Emacs Lisp interpreter.
- Modules can create `user-ptr' Lisp objects that embed pointers to C
- struct's defined by the module. This is useful for keeping around
+ Modules can create 'user-ptr' Lisp objects that embed pointers to C
+ structs defined by the module. This is useful for keeping around
complex data structures created by a module, to be passed back to the
module's functions. User-ptr objects can also have associated
"finalizers" -- functions to be run when the object is GC'ed; this is
useful for freeing any resources allocated for the underlying data
structure, such as memory, open file descriptors, etc. A new
- predicate `user-ptrp' returns non-nil if its argument is a `user-ptr'
+ predicate 'user-ptrp' returns non-nil if its argument is a 'user-ptr'
object.
Loadable modules in Emacs are an experimental feature, and subject to
change in future releases. For that reason, their support is disabled
- by default, and must be enabled by using the `--with-modules' option
+ by default, and must be enabled by using the '--with-modules' option
at configure time.
- See the variable `dir-locals-file-2' for more information.
++++
+** A second dir-local file (.dir-locals-2.el) is now accepted.
++See the variable 'dir-locals-file-2' for more information.
+
+++
** Network security (TLS/SSL certificate validity and the like) is
added via the new Network Security Manager (NSM) and controlled via
- the `network-security-level' variable.
+ the 'network-security-level' variable.
- puny.el library, so that one can visit web sites like
- "http://méxico.icom.museum".
+---
+** International domain names (IDNA) are now encoded via the new
++puny.el library, so that one can visit web sites with non-ASCII URLs.
+
+++
** C-h l now also lists the commands that were run.
+** The new M-s M-w key binding uses eww to search the web for the
+text in the region.
+
+++
- ** The new `timer-list' command lists all active timers in a buffer
- where you can cancel them with the `c' command.
-** x-select-enable-clipboard is renamed select-enable-clipboard
-and x-select-enable-primary is renamed select-enable-primary.
++** The new 'timer-list' command lists all active timers in a buffer
++where you can cancel them with the 'c' command.
+
+** M-x suggests shorthands and ignores obsolete commands for completion.
+** x-select-enable-clipboard is renamed select-enable-clipboard.
+x-select-enable-primary and renamed select-enable-primary.
Additionally they both now apply to all systems (OSX, GNUstep, Windows, you
name it), with the proviso that on some systems (e.g. Windows)
select-enable-primary is ineffective since the system doesn't
have the equivalent of a primary selection.
+++
- ** New option `switch-to-buffer-in-dedicated-window' allows you to
- customize how `switch-to-buffer' proceeds interactively when the
+ ** New option 'switch-to-buffer-in-dedicated-window' allows you to
+ customize how 'switch-to-buffer' proceeds interactively when the
selected window is strongly dedicated to its buffer.
+++
- ** The option `even-window-heights' has been renamed to
- `even-window-sizes' and now handles window widths as well.
+ ** The option 'even-window-heights' has been renamed to
+ 'even-window-sizes' and now handles window widths as well.
- ** New function `read-multiple-choice' use to prompt for
++++
++** New function 'read-multiple-choice' use to prompt for
+multiple-choice questions, with a handy way to display help texts.
+
+++
** terpri gets an optional arg ENSURE to conditionally output a newline.
+++
- ** `insert-register' now leaves point after the inserted text
+ ** 'insert-register' now leaves point after the inserted text
when called interactively. A prefix argument toggles this behavior.
+++
- ** The new variable `term-file-aliases' replaces some files from lisp/term.
- The function `tty-run-terminal-initialization' consults this variable
+ ** The new variable 'term-file-aliases' replaces some files from lisp/term.
+ The function 'tty-run-terminal-initialization' consults this variable
when deciding what terminal-specific initialization code to run.
---
- ** New variable `system-configuration-features', listing some of the
+ ** New variable 'system-configuration-features', listing some of the
main features that Emacs was compiled with. This is mainly intended
for use in Emacs bug reports.
+++
** A password is now hidden also when typed in batch mode. Another
- hiding character but the default `.' can be used by let-binding the
- variable `read-hide-char'.
+ hiding character but the default '.' can be used by let-binding the
+ variable 'read-hide-char'.
+++
** The Emacs pseudo-random number generator can be securely seeded.
On system where Emacs can access the system entropy or some other
- cryptographically secure random stream, it now uses that when `random'
- is called with its argument `t'. This allows cryptographically strong
+ cryptographically secure random stream, it now uses that when 'random'
+ is called with its argument 't'. This allows cryptographically strong
random values; in particular, the Emacs server now uses this facility
to produce its authentication key.
---
- ** New input methods: `tamil-dvorak' and `programmer-dvorak'.
+ ** New input methods: 'tamil-dvorak' and 'programmer-dvorak'.
\f
* Editing Changes in Emacs 25.1
+++
*** Successive single-char deletions are collapsed in the undo-log just like
successive char insertions. Which commands invoke this behavior is
- controlled by the new `undo-auto-amalgamate' function. See the node
+ controlled by the new 'undo-auto-amalgamate' function. See the node
"Undo" in the ELisp manual for more details.
+++
- *** The heuristic used to insert `undo-boundary' after each command
+ *** The heuristic used to insert 'undo-boundary' after each command
has changed, so that if a command causes changes in more than just the
- current buffer, Emacs now calls `undo-boundary' in every buffer
+ current buffer, Emacs now calls 'undo-boundary' in every buffer
affected by the command.
+++
- ** New command `comment-line' bound to `C-x C-;'.
+ ** New command 'comment-line' bound to 'C-x C-;'.
** New and improved facilities for inserting Unicode characters
*** Unicode names entered via C-x 8 RET now use substring completion by default.
+++
- *** C-x 8 now has shorthands for these chars: ‐ ‑ ‒ – — ― ‘ ’ “ ” † ‡ • ′ ″
- € № ← → ↔ − ≈ ≠ ≤ ≥. As before, you can type C-x 8 C-h to list shorthands.
+ *** C-x 8 now has shorthands for several chars, such as U+2010
+ (HYPHEN), U+2011 (NON-BREAKING HYPHEN), and U+2012 (FIGURE DASH). As
+ before, you can type C-x 8 C-h to list shorthands.
+++
- *** New minor mode electric-quote-mode for quoting ‘like this’ and “like this”
- as you type. See also the new variable ‘text-quoting-style’.
+ *** New minor mode electric-quote-mode for using curved quotes as you
+ type. See also the new variable 'text-quoting-style'.
---
** New minor mode global-eldoc-mode is enabled by default.
standards.
+++
- ** You can access `mouse-buffer-menu' (C-down-mouse-1) using C-f10.
+ ** You can access 'mouse-buffer-menu' (C-down-mouse-1) using C-f10.
+++
- ** New buffer-local `electric-pair-local-mode'.
+ ** New buffer-local 'electric-pair-local-mode'.
+++
- ** New variable `fast-but-imprecise-scrolling' inhibits
+ ** New variable 'fast-but-imprecise-scrolling' inhibits
fontification during full screen scrolling operations, giving less
hesitant operation during auto-repeat of C-v, M-v at the cost of
possible inaccuracies in the end position.
+++
- ** New documentation command `describe-symbol'.
- Works for functions, variables, faces, etc. It is bound to `C-h o' by
+ ** New documentation command 'describe-symbol'.
+ Works for functions, variables, faces, etc. It is bound to 'C-h o' by
default.
+++
- ** New function `custom-prompt-customize-unsaved-options' checks for
+ ** New function 'custom-prompt-customize-unsaved-options' checks for
unsaved customizations and prompts user to customize (if found). It
is intended for adding to 'kill-emacs-query-functions'.
+++
- ** The old `C-x w' bindings in hi-lock-mode are officially deprecated
- in favor of the global `M-s h' bindings introduced in Emacs-23.1.
+ ** The old 'C-x w' bindings in hi-lock-mode are officially deprecated
+ in favor of the global 'M-s h' bindings introduced in Emacs-23.1.
They'll disappear soon.
- `undo', undo the last replacement; bound to `u'.
- `undo-all', undo all replacements; bound to `U'.
++++
+** New bindings for 'query-replace-map'.
++'undo', undo the last replacement; bound to 'u'.
++'undo-all', undo all replacements; bound to 'U'.
+
\f
* Changes in Specialized Modes and Packages in Emacs 25.1
** Checkdoc
+++
- *** New command `checkdoc-package-keywords' checks if the
+ *** New command 'checkdoc-package-keywords' checks if the
current package keywords are recognized. Set the new option
- `checkdoc-package-keywords-flag' to non-nil to make
- `checkdoc-current-buffer' call this function automatically.
+ 'checkdoc-package-keywords-flag' to non-nil to make
+ 'checkdoc-current-buffer' call this function automatically.
+++
- *** New function `checkdoc-file' checks for style errors.
- It's meant for use together with `compile':
+ *** New function 'checkdoc-file' checks for style errors.
+ It's meant for use together with 'compile':
emacs -batch --eval "(checkdoc-file \"subr.el\")"
** Desktop
to version 206, you can do this with C-u C-u M-x desktop-save.
+++
- ** New function `bookmark-set-no-overwrite' bound to C-x r M.
+ ** New function 'bookmark-set-no-overwrite' bound to C-x r M.
It raises an error if a bookmark of that name already exists,
- unlike `bookmark-set' which silently updates an existing bookmark.
+ unlike 'bookmark-set' which silently updates an existing bookmark.
** Gnus
+++
- *** New user options `mm-html-inhibit-images' and `mm-html-blocked-images'
+ *** New user options 'mm-html-inhibit-images' and 'mm-html-blocked-images'
now control how mm-* functions fetch and display images in an HTML
- message. Gnus still uses `gnus-inhibit-images' and `gnus-blocked-images'
+ message. Gnus still uses 'gnus-inhibit-images' and 'gnus-blocked-images'
for that purpose, i.e., binds mm-html- variables with those gnus-
variables, but other packages do not have to bind gnus- variables now.
---
- *** `mm-inline-text-html-with-images' has been removed.
- Use `mm-html-inhibit-images' instead. Note that the value is opposite
+ *** 'mm-inline-text-html-with-images' has been removed.
+ Use 'mm-html-inhibit-images' instead. Note that the value is opposite
in meaning.
** IMAP
---
- *** `imap-ssl-program' has been removed, and imap.el uses the internal
+ *** 'imap-ssl-program' has been removed, and imap.el uses the internal
GnuTLS encryption functions if possible.
** JSON
---
- *** `json-pretty-print' and `json-pretty-print-buffer' now maintain
+ *** 'json-pretty-print' and 'json-pretty-print-buffer' now maintain
the ordering of object keys by default.
---
- *** New commands `json-pretty-print-ordered' and
- `json-pretty-print-buffer-ordered' pretty prints JSON objects with
+ *** New commands 'json-pretty-print-ordered' and
+ 'json-pretty-print-buffer-ordered' pretty prints JSON objects with
object keys sorted alphabetically.
+++
environments or ANTLR programs with embedded Python code.
A major mode can provide indentation context for a sub-mode through
- the `prog-indentation-context' variable. To support this, modes that
- provide indentation should use `prog-widen' instead of `widen' and
- `prog-first-column' instead of a literal zero. See the node
+ the 'prog-indentation-context' variable. To support this, modes that
+ provide indentation should use 'prog-widen' instead of 'widen' and
+ 'prog-first-column' instead of a literal zero. See the node
"Mode-Specific Indent" in the ELisp manual for more details.
** Prettify Symbols mode
+++
*** Prettify Symbols mode supports custom composition predicates. By
- overriding the default `prettify-symbols-compose-predicate', modes can
+ overriding the default 'prettify-symbols-compose-predicate', modes can
specify in which contexts a symbol may be displayed as some Unicode
- character. `prettify-symbols-default-compose-p' is the default which
+ character. 'prettify-symbols-default-compose-p' is the default which
is suitable for most programming languages such as C or Lisp (but not
(La)TeX).
+++
*** Symbols can be unprettified while point is inside them.
- New variable `prettify-symbols-unprettify-at-point' configures this.
+ New variable 'prettify-symbols-unprettify-at-point' configures this.
** Enhanced xterm support
---
- *** The new variable `xterm-screen-extra-capabilities' for configuring xterm.
+ *** The new variable 'xterm-screen-extra-capabilities' for configuring xterm.
This variable tells Emacs which advanced capabilities are available in
the xterm terminal emulator used to display Emacs text-mode frames.
The default is to check each capability, and use it if available.
---
*** Killing text now also sets the CLIPBOARD/PRIMARY selection
in the surrounding GUI (using the OSC-52 escape sequence). This only works
- if your xterm supports it and enables the `allowWindowOps' options (disabled
+ if your xterm supports it and enables the 'allowWindowOps' options (disabled
by default at least in Debian, for security reasons).
Similarly, you can yank the CLIPBOARD/PRIMARY selection (using the OSC-52
escape sequence) if your xterm has the feature enabled but for that you
- additionally need to add `getSelection' to `xterm-extra-capabilities'.
+ additionally need to add 'getSelection' to 'xterm-extra-capabilities'.
+++
- *** `xterm-mouse-mode' now supports mouse-tracking (if your xterm supports it).
+ *** 'xterm-mouse-mode' now supports mouse-tracking (if your xterm supports it).
---
- ** The way to turn on and off `save-place' mode has changed.
+ ** The way to turn on and off 'save-place' mode has changed.
It is no longer sufficient to load the saveplace library and set
- `save-place' non-nil. Instead, use the two new minor modes:
- `save-place-mode' turns on saving last place in every file, and
- `save-place-local-mode' does that only for the file in whose buffer it
- is invoked. The `save-place' variable is now an obsolete alias for
- `save-place-mode', which replaces it, and `toggle-save-place' is an
- obsolete alias for the new `save-place-local-mode' command.
+ 'save-place' non-nil. Instead, use the two new minor modes:
+ 'save-place-mode' turns on saving last place in every file, and
+ 'save-place-local-mode' does that only for the file in whose buffer it
+ is invoked. The 'save-place' variable is now an obsolete alias for
+ 'save-place-mode', which replaces it, and 'toggle-save-place' is an
+ obsolete alias for the new 'save-place-local-mode' command.
** ERC
+++
*** ERC can now hide message types by network or channel.
- `erc-hide-list' will hide all messages of the specified type, while
- `erc-network-hide-list' and `erc-channel-hide-list' will only hide the
+ 'erc-hide-list' will hide all messages of the specified type, while
+ 'erc-network-hide-list' and 'erc-channel-hide-list' will only hide the
specified message types for the respective specified targets.
- *** New variable `erc-default-port-tls' used to connect to TLS IRC
++*** New variable 'erc-default-port-tls' used to connect to TLS IRC
+servers.
+
---
*** Reconnection is now asynchronous.
---
*** New commands, key binds, and menu items.
- **** `<' and `>' for navigating previous and next tracks in playlist
+ **** '<' and '>' for navigating previous and next tracks in playlist
- **** New play/pause command `mpc-toggle-play' bound to `s'
+ **** New play/pause command 'mpc-toggle-play' bound to 's'
- **** `g' bound to new command `mpc-seek-current' will navigate current
+ **** 'g' bound to new command 'mpc-seek-current' will navigate current
track.
- **** New commands `mpc-toggle-{consume,repeat,single,shuffle}' for
+ **** New commands 'mpc-toggle-{consume,repeat,single,shuffle}' for
toggling playback modes.
---
** Midnight-mode
---
- *** `midnight-mode' is now a proper minor mode.
+ *** 'midnight-mode' is now a proper minor mode.
---
*** clean-buffer-*-regexps can now specify buffers via predicate functions.
+++
*** New "external" package status.
An external package is any installed package that's not built-in and
- not from `package-user-dir', which usually means it's from an entry in
- `package-directory-list'. They are treated much like built-in
+ not from 'package-user-dir', which usually means it's from an entry in
+ 'package-directory-list'. They are treated much like built-in
packages, in that they cannot be deleted through the package menu and
are not considered for upgrades.
The effect is that a user can manually place a specific version of a
- package inside `package-directory-list' and the package menu will
+ package inside 'package-directory-list' and the package menu will
always respect that.
+++
*** If a package is available on multiple archives and one has higher
- priority (as per `package-archive-priorities') only that one is
- listed. This can be configured with `package-menu-hide-low-priority'.
+ priority (as per 'package-archive-priorities') only that one is
+ listed. This can be configured with 'package-menu-hide-low-priority'.
+++
- *** `package-menu-toggle-hiding' now toggles the hiding of packages.
+ *** 'package-menu-toggle-hiding' now toggles the hiding of packages.
This includes the above-mentioned low-priority packages, as well as
available packages whose version is lower than the currently installed
version (which were previously impossible to display).
asynchronously.
---
- *** New variable `package-menu-async' controls whether the
+ *** New variable 'package-menu-async' controls whether the
package-menu uses asynchronous downloads.
---
- *** `package-install-from-buffer' and `package-install-file' work on directories.
+ *** 'package-install-from-buffer' and 'package-install-file' work on directories.
This follows the same rules as installing from a .tar file, except the
-pkg file is optional.
---
*** Packages which are dependencies of other packages cannot be deleted.
- The FORCE argument to `package-delete' overrides this.
+ The FORCE argument to 'package-delete' overrides this.
---
- *** New custom variable `package-selected-packages' tracks packages
+ *** New custom variable 'package-selected-packages' tracks packages
which were installed by the user (as opposed to installed as
dependencies). This variable can also be manually customized.
---
- *** New command `package-install-selected-packages' installs all
- packages from `package-selected-packages' which are currently missing.
+ *** New command 'package-install-selected-packages' installs all
+ packages from 'package-selected-packages' which are currently missing.
---
- *** `package-install' function now takes a DONT-SELECT argument. If
+ *** 'package-install' function now takes a DONT-SELECT argument. If
this function is called interactively or if DONT-SELECT is nil, add the
- package being installed to `package-selected-packages'.
+ package being installed to 'package-selected-packages'.
---
- *** New command `package-autoremove' removes all packages which were
+ *** New command 'package-autoremove' removes all packages which were
installed strictly as dependencies but are no longer needed.
+++
** Shell
- When you invoke `shell' interactively, the *shell* buffer will now
+ When you invoke 'shell' interactively, the *shell* buffer will now
display in a new window. However, you can customize this behavior via
- the `display-buffer-alist' variable. For example, to get
+ the 'display-buffer-alist' variable. For example, to get
the old behavior -- *shell* buffer displays in current window -- use
(add-to-list 'display-buffer-alist
'("^\\*shell\\*$" . (display-buffer-same-window))).
** EIEIO
+++
- *** The `:protection' slot option is not obeyed any more.
+ *** The ':protection' slot option is not obeyed any more.
+++
- *** The `newname' argument to constructors is optional&deprecated.
- If you need your objects to be named, do it by inheriting from `eieio-named'.
+ *** The 'newname' argument to constructors is optional&deprecated.
+ If you need your objects to be named, do it by inheriting from 'eieio-named'.
+++
*** The <class>-list-p and <class>-child-p functions are declared obsolete.
+++
*** defgeneric and defmethod are declared obsolete.
Use the equivalent facilities from cl-generic.el instead.
+++
- *** `constructor' is now an obsolete alias for `make-instance'.
- --- `pcase' accepts a new UPattern `eieio'.
+ *** 'constructor' is now an obsolete alias for 'make-instance'.
+ --- 'pcase' accepts a new UPattern 'eieio'.
** ido
+++
- *** New command `ido-bury-buffer-at-head' bound to C-S-b
- Bury the buffer at the head of `ido-matches', analogous to how C-k
+ *** New command 'ido-bury-buffer-at-head' bound to C-S-b
+ Bury the buffer at the head of 'ido-matches', analogous to how C-k
kills the buffer at head.
---
- *** A prefix argument to `ido-restrict-to-matches' will reverse its
+ *** A prefix argument to 'ido-restrict-to-matches' will reverse its
meaning, and the list is restricted to those elements that do not
match the current input.
+++
*** You can use <UP> and <DOWN> arrow keys to move through history by lines.
- The new commands `next-line-or-history-element' and
- `previous-line-or-history-element', bound to <UP> and <DOWN> in the
+ The new commands 'next-line-or-history-element' and
+ 'previous-line-or-history-element', bound to <UP> and <DOWN> in the
minibuffer, allow by-line movement through minibuffer history,
similarly to an ordinary buffer. Only when point moves over
the bottom/top of the minibuffer it goes to the next/previous history
- element. `M-p' and `M-n' still move directly to previous/next history
+ element. 'M-p' and 'M-n' still move directly to previous/next history
item as before.
** Search and Replace
+++
- *** `isearch' and `query-replace' can now perform character folding in matches.
+ *** 'isearch' and 'query-replace' can now perform character folding in matches.
This is analogous to case folding, but instead of disregarding case
variants, it disregards wider classes of distinctions between similar
characters. (Case folding is a special case of character folding.)
groups of characters instead of just themselves.
For instance, the ASCII double quote character " will match all
- variants of double quotes (like “ and ”), and the letter a will match
- all of its accented cousins, even those composed of multiple
- characters, as well as many other symbols like ℀, ℁, ⒜, and ⓐ.
+ variants of double quotes, and the letter 'a' will match all of its
+ accented cousins, even those composed of multiple characters, as well
+ as many other symbols like U+249C (PARENTHESIZED LATIN SMALL LETTER
+ A).
- Character folding is enabled by customizing `search-default-mode' to
- the value `character-fold-to-regexp'. You can also toggle character
- folding in the middle of a search by typing `M-s ''.
+ Character folding is enabled by customizing 'search-default-mode' to
+ the value 'character-fold-to-regexp'. You can also toggle character
+ folding in the middle of a search by typing 'M-s ''.
- `query-replace' honors character folding if the new variable
- `replace-character-fold' is customized to a non-nil value.
+ 'query-replace' honors character folding if the new variable
+ 'replace-character-fold' is customized to a non-nil value.
+++
- *** New user option `search-default-mode'.
+ *** New user option 'search-default-mode'.
This option specifies the default mode for Isearch. The default
value, nil specifies that Isearch does literal searches (however,
- `case-fold-search' and `isearch-lax-whitespace' may still be applied,
+ 'case-fold-search' and 'isearch-lax-whitespace' may still be applied,
as in previous Emacs versions).
+++
- *** New function `character-fold-to-regexp' can be used
+ *** New function 'character-fold-to-regexp' can be used
by searching commands to produce a regexp matching anything that
character-folds into STRING.
+++
*** The new M-s M-w key binding uses eww to search the web for the
text in the region. The search engine to use for this is specified by
- the customizable variable `eww-search-prefix'.
+ the customizable variable 'eww-search-prefix'.
+++
*** Query-replace history is enhanced.
When query-replace reads the FROM string from the minibuffer, typing
- `M-p' will now show previous replacements as "FROM SEP TO", where FROM
+ 'M-p' will now show previous replacements as "FROM SEP TO", where FROM
and TO are the original text and its replacement, and SEP is an arrow
- string defined by the new variable `query-replace-from-to-separator'.
- To select a prior replacement, type `M-p' until the desired
+ string defined by the new variable 'query-replace-from-to-separator'.
+ To select a prior replacement, type 'M-p' until the desired
replacement appears in the minibuffer, and then exit the minibuffer by
typing RET.
** Calc
+++
- *** If `quick-calc' is called with a prefix argument, insert the
+ *** If 'quick-calc' is called with a prefix argument, insert the
result of the calculation into the current buffer.
+++
** ElDoc
+++
- *** New minor mode `global-eldoc-mode'
- It is turned on by default, and affects `*scratch*' and other buffers
+ *** New minor mode 'global-eldoc-mode'
+ It is turned on by default, and affects '*scratch*' and other buffers
whose major mode supports Emacs Lisp.
---
- *** `eldoc-documentation-function' now defaults to `ignore'
+ *** 'eldoc-documentation-function' now defaults to 'ignore'
---
- *** `describe-char-eldoc' displays information about character at point,
- and can be used as a default value of `eldoc-documentation-function'. It is
- useful when, for example, one needs to distinguish various spaces (e.g. ] [,
- ] [, ] [, etc.) while using mono-spaced font.
+ *** 'describe-char-eldoc' displays information about character at point,
+ and can be used as a default value of 'eldoc-documentation-function'. It is
+ useful when, for example, one needs to distinguish various spaces - e.g.,
+ U+00A0 (NO-BREAK SPACE), U+2002 (EN SPACE), and U+2009 (THIN SPACE) - while
+ using mono-spaced font.
** eww
*** HTML can now be rendered using variable-width fonts.
+++
- *** A new command `F' (`eww-toggle-fonts') can be used to toggle
+ *** A new command 'F' ('eww-toggle-fonts') can be used to toggle
whether to use variable-pitch fonts or not. The user can also
- customize the `shr-use-fonts' variable.
+ customize the 'shr-use-fonts' variable.
- *** A new command `C' (`eww-toggle-colors') can be used to toggle
++++
- customize the `shr-use-colors' variable.
++*** A new command 'C' ('eww-toggle-colors') can be used to toggle
+whether to use the HTML-specified colors or not. The user can also
++customize the 'shr-use-colors' variable.
+
+++
- *** A new command `R' (`eww-readable') will try do identify the main
+ *** A new command 'R' ('eww-readable') will try do identify the main
textual parts of a web page and display only that, leaving menus and
the like off the page.
+++
- *** A new command `D' (`eww-toggle-paragraph-direction') allows you to
+ *** A new command 'D' ('eww-toggle-paragraph-direction') allows you to
toggle the paragraph direction between left-to-right and right-to-left.
+---
+*** Images that are being loaded are now marked with grey
+"placeholder" images of the size specified by the HTML. They are then
+replaced by the real images asynchronously, which will also now
+respect width/height HTML specs (unless they specify widths/heights
+bigger than the current window).
+
---
*** You can now use several eww buffers in parallel by renaming eww
buffers you want to keep separate.
pages visited) is now preserved in the desktop file.
+++
- *** `eww-after-render-hook' is now called after eww has rendered
+ *** 'eww-after-render-hook' is now called after eww has rendered
the data in the buffer.
---
- *** The `eww-reload' command now takes a prefix to not reload via
+ *** The 'eww-reload' command now takes a prefix to not reload via
the net, but just use the local copy of the HTML.
+++
details.
+++
- *** `mailcap-mime-data' is now consulted when displaying PDF files.
+ *** 'mailcap-mime-data' is now consulted when displaying PDF files.
+++
- *** The new `S' command will list all eww buffers, and allow managing
+ *** The new 'S' command will list all eww buffers, and allow managing
them.
---
*** text/html messages that contain inline image parts will be
transformed into multipart/related messages before sending.
- *** The `message-valid-fqdn-regexp' variable has been removed, since
+---
- *** `message-beginning-of-line' (bound to C-a) understands folded headers.
- In `visual-line-mode' it will look for the true beginning of a header
- while in non-`visual-line-mode' it will move the point to the indented
- header’s value.
++*** The 'message-valid-fqdn-regexp' variable has been removed, since
+there are now top-level domains added all the time. Message will no
+longer warn about sending emails to top-level domains it hasn't heard
+about.
+
++*** 'message-beginning-of-line' (bound to C-a) understands folded headers.
++In 'visual-line-mode' it will look for the true beginning of a header
++while in non-'visual-line-mode' it will move the point to the indented
++header's value.
+
+++
** In Show Paren Mode, a parenthesis can be highlighted when point
stands inside it, and certain parens can be highlighted when point is
at BOL or EOL, or in whitespace there. To enable these, customize,
- respectively, `show-paren-when-point-inside-paren' or
- `show-paren-when-point-in-periphery'.
+ respectively, 'show-paren-when-point-inside-paren' or
+ 'show-paren-when-point-in-periphery'.
---
** If gpg2 exists on the system, it is now used as the default value
- of `epg-gpg-program' (instead of gpg).
+ of 'epg-gpg-program' (instead of gpg).
- `image-scaling-factor' variable (if Emacs supports scaling the images
+** Images
+
++++
+*** Images are automatically scaled before displaying based on the
- *** Images inserted with `insert-image' and related functions get a
++'image-scaling-factor' variable (if Emacs supports scaling the images
+in question).
+
++++
- also available in `image-mode'.
++*** Images inserted with 'insert-image' and related functions get a
+keymap put into the text properties (or overlays) that span the
+image. This keymap binds keystrokes for manipulating size and
+rotation, as well as saving the image to a file. These commands are
- provided: `image-property'.
++also available in 'image-mode'.
+
++++
+*** A new library for creating and manipulating SVG images has been
+added. See the "SVG Images" section in the lispref manual for
+details.
+
++++
+*** New setf-able function to access and set image parameters is
++provided: 'image-property'.
+
+
** Lisp mode
---
- *** Strings after `:documentation' are highlighted as docstrings.
+ *** Strings after ':documentation' are highlighted as docstrings.
This enhances Lisp mode fontification to handle documentation of the
- form `(:documentation "the doc string")' used in Common Lisp code for
+ form '(:documentation "the doc string")' used in Common Lisp code for
CLOS class and slot documentation.
** Rectangle editing
+++
*** C-x C-x in rectangle-mark-mode now cycles through the four corners.
- *** `string-rectangle' provides on-the-fly preview of the result.
+ *** 'string-rectangle' provides on-the-fly preview of the result.
+++
- ** New font-lock functions `font-lock-ensure' and `font-lock-flush'.
- These should be used in preference to `font-lock-fontify-buffer' when
+ ** New font-lock functions 'font-lock-ensure' and 'font-lock-flush'.
+ These should be used in preference to 'font-lock-fontify-buffer' when
called from Lisp.
---
- ** Macro `minibuffer-with-setup-hook' can optionally append a function
- to `minibuffer-setup-hook'.
+ ** Macro 'minibuffer-with-setup-hook' can optionally append a function
+ to 'minibuffer-setup-hook'.
- If the first argument of the macro is of the form `(:append FUN)',
- then FUN will be appended to `minibuffer-setup-hook', instead of
+ If the first argument of the macro is of the form '(:append FUN)',
+ then FUN will be appended to 'minibuffer-setup-hook', instead of
prepending it.
** cl-lib
+++
- *** New functions `cl-fresh-line', `cl-digit-char-p', and `cl-parse-integer'.
+ *** New functions 'cl-fresh-line', 'cl-digit-char-p', and 'cl-parse-integer'.
---
- *** `pcase' accepts the new UPattern `cl-struct'.
+ *** 'pcase' accepts the new UPattern 'cl-struct'.
** Calendar and diary
+++
- *** The default `diary-file' is now located in .emacs.d.
+ *** The default 'diary-file' is now located in .emacs.d.
+++
*** New commands to insert diary entries with Chinese dates:
- `diary-chinese-insert-anniversary-entry' `diary-chinese-insert-entry'
- `diary-chinese-insert-monthly-entry', `diary-chinese-insert-yearly-entry'.
+ 'diary-chinese-insert-anniversary-entry' 'diary-chinese-insert-entry'
+ 'diary-chinese-insert-monthly-entry', 'diary-chinese-insert-yearly-entry'.
+++
*** The calendar can now list and mark diary entries with Chinese dates.
- See `diary-chinese-list-entries' and `diary-chinese-mark-entries'.
+ See 'diary-chinese-list-entries' and 'diary-chinese-mark-entries'.
---
- *** The option `calendar-mode-line-format' can now be nil,
+ *** The option 'calendar-mode-line-format' can now be nil,
which means to do nothing special with the mode line in calendars.
+++
- *** New option `calendar-weekend-days'.
+ *** New option 'calendar-weekend-days'.
The option customizes which day headers receive the
- `calendar-weekend-header' face.
+ 'calendar-weekend-header' face.
---
- *** New optional args N and STRING for ‘holiday-greek-orthodox-easter’.
+ *** New optional args N and STRING for 'holiday-greek-orthodox-easter'.
---
*** Many items obsolete since at least version 23.1 have been removed.
The majority were function/variable/face aliases, too numerous to list here.
The remainder were:
- **** Functions `calendar-one-frame-setup', `calendar-only-one-frame-setup',
- `calendar-two-frame-setup', `european-calendar', `american-calendar'.
+ **** Functions 'calendar-one-frame-setup', 'calendar-only-one-frame-setup',
+ 'calendar-two-frame-setup', 'european-calendar', 'american-calendar'.
- **** Hooks `cal-menu-load-hook', `cal-x-load-hook'.
+ **** Hooks 'cal-menu-load-hook', 'cal-x-load-hook'.
- **** Macro `calendar-for-loop'.
+ **** Macro 'calendar-for-loop'.
- **** Variables `european-calendar-style', `diary-face', `hebrew-holidays-{1,4}'.
+ **** Variables 'european-calendar-style', 'diary-face', 'hebrew-holidays-{1,4}'.
- **** The nil and list forms of `diary-display-function'.
+ **** The nil and list forms of 'diary-display-function'.
+++
- ** New ERT function `ert-summarize-tests-batch-and-exit'.
+ ** New ERT function 'ert-summarize-tests-batch-and-exit'.
If the output of ERT tests in batch mode execution can be saved to a
log file, then it can be passed as an argument to the above function
to produce a neat summary.
---
- ** New js.el option `js-indent-first-init'.
+ ** New js.el option 'js-indent-first-init'.
** Info
---
** Info mode now displays symbol names in fixed-pitch font.
- If you want to get the old behavior back, customize the `Info-quoted'
+ If you want to get the old behavior back, customize the 'Info-quoted'
face to use the same definitions as the default face.
---
- *** `Info-fontify-maximum-menu-size' can be t for no limit.
+ *** 'Info-fontify-maximum-menu-size' can be t for no limit.
+++
- *** `info-display-manual' can now be given a prefix argument which (any
+ *** 'info-display-manual' can now be given a prefix argument which (any
non-nil value) directs the command to limit the completion
alternatives to currently visited manuals.
** Rmail
+++
- *** The Rmail commands `d', `C-d' and `u' take optional repeat counts
+ *** The Rmail commands 'd', 'C-d' and 'u' take optional repeat counts
to delete or undelete multiple messages.
+++
libxml2 or if you have the Lynx browser installed. By default, Rmail
will display the HTML version of a mail message that has both HTML and
plain text parts, if display of HTML email is possible; customize the
- `rmail-mime-prefer-html' option to `nil' if you don't want that.
+ 'rmail-mime-prefer-html' option to 'nil' if you don't want that.
+++
*** In the commands that make summaries by subject, recipients, or senders,
you can no longer use commas to separate regular expressions.
+++
- ** SES now supports local printer functions; see `ses-define-local-printer'.
+ ** SES now supports local printer functions; see 'ses-define-local-printer'.
** Shell-script Mode
---
- *** In sh-mode you can now use `sh-shell' as a file-local variable to
+ *** In sh-mode you can now use 'sh-shell' as a file-local variable to
specify the type of shell in use (bash, csh, etc).
---
- *** New value `always' for `sh-indent-after-continuation'.
+ *** New value 'always' for 'sh-indent-after-continuation'.
This provides old-style ("dumb") indentation of continued lines.
- See the doc string of `sh-indent-after-continuation' for details.
+ See the doc string of 'sh-indent-after-continuation' for details.
** TLS
---
program is used instead. This program used to be run in --insecure
mode by default, but has now changed to be secure instead, and will
fail if you try to connect to non-verifiable hosts. This is
- controlled by the `tls-program' variable.
+ controlled by the 'tls-program' variable.
** URL
+++
*** The URL package accepts now the protocols "ssh", "scp" and "rsync".
- When `url-handler-mode' is enabled, file operations for these
+ When 'url-handler-mode' is enabled, file operations for these
protocols as well as for "telnet" and "ftp" are passed to Tramp.
+++
- *** The URL package allows customizing the `url-user-agent' string.
- The new `url-user-agent' variable can be customized to be a string or
+ *** The URL package allows customizing the 'url-user-agent' string.
+ The new 'url-user-agent' variable can be customized to be a string or
a function.
---
- *** The new interface variable `url-request-noninteractive' can be used
+ *** The new interface variable 'url-request-noninteractive' can be used
to specify that we're running in a noninteractive context, and that
we should not be queried about things like TLS certificate validity.
---
- *** `url-mime-accept-string' can now be used as in "interface"
- variable, meaning you can bind it around an `url-retrieve' call.
+ *** 'url-mime-accept-string' can now be used as in "interface"
+ variable, meaning you can bind it around an 'url-retrieve' call.
---
*** If URL is used with a https connection, the first callback argument
plist will contain a :peer element that has the output of
- `gnutls-peer-status' (if Emacs is built with GnuTLS support).
+ 'gnutls-peer-status' (if Emacs is built with GnuTLS support).
- *** The new function `url-cookie-delete-cookie' can be used to
++++
++*** The new function 'url-cookie-delete-cookie' can be used to
+programmatically delete all cookies, or cookies from a specific
+domain.
+
** Tramp
+++
+++
*** Method-specific parameters can be overwritten now with variable
- `tramp-connection-properties'.
+ 'tramp-connection-properties'.
---
- *** Handler for `file-notify-valid-p' for remote machines that support
+ *** Handler for 'file-notify-valid-p' for remote machines that support
filesystem notifications.
** SQL mode
---
- *** New user variable `sql-default-directory' enables remote
+ *** New user variable 'sql-default-directory' enables remote
connections using Tramp.
---
- *** New command `sql-send-line-and-next'.
- This command, bound to `C-c C-n' by default, sends the current line to
+ *** New command 'sql-send-line-and-next'.
+ This command, bound to 'C-c C-n' by default, sends the current line to
the SQL process and advances to the next line, skipping whitespace and
comments.
** VC and related modes
+++
- *** Basic push support, via `vc-push', bound to `C-x v P'.
+ *** Basic push support, via 'vc-push', bound to 'C-x v P'.
Implemented for Bzr, Git, Hg. As part of this change, the pre-existing
(undocumented) command vc-hg-push now behaves slightly differently.
*** The new command vc-region-history shows the log+diff of the active region.
+++
- *** You can refresh the VC state of a file buffer with `M-x vc-refresh-state'.
+ *** You can refresh the VC state of a file buffer with 'M-x vc-refresh-state'.
This command is useful when you perform version control commands
outside Emacs (e.g., from the shell prompt), or if you switch the VC
back-end for the buffer's file, or remove it from version control.
- See the `vc-faces' customization group.
+---
+*** The VC state indicator in the mode line now defaults to more
+colorful faces to make it more obvious to the user what the state is.
++See the 'vc-faces' customization group.
+
+++
- *** New option `vc-annotate-background-mode' controls whether
- the color range from `vc-annotate-color-map' is applied to the
+ *** New option 'vc-annotate-background-mode' controls whether
+ the color range from 'vc-annotate-color-map' is applied to the
background or to the foreground.
+++
- *** `compare-windows' now compares text with the most recently selected window
+ *** 'compare-windows' now compares text with the most recently selected window
instead of the next window. If you want the previous behavior of
comparing with the next window, customize the new option
- `compare-windows-get-window-function' to the value
- `compare-windows-get-next-window'.
+ 'compare-windows-get-window-function' to the value
+ 'compare-windows-get-next-window'.
---
- *** Two new faces `compare-windows-removed' and `compare-windows-added'
- replace the face `compare-windows', which is now an obsolete alias for
- `compare-windows-added'.
+ *** Two new faces 'compare-windows-removed' and 'compare-windows-added'
+ replace the face 'compare-windows', which is now an obsolete alias for
+ 'compare-windows-added'.
---
*** The VC state indicator in the mode line now has different faces
- corresponding to each of the possible states. See the `vc-faces'
+ corresponding to each of the possible states. See the 'vc-faces'
customization group.
---
- *** `log-edit-insert-changelog' converts "(tiny change)" to
- "Copyright-paperwork-exempt: yes". Set `log-edit-rewrite-tiny-change'
+ *** 'log-edit-insert-changelog' converts "(tiny change)" to
+ "Copyright-paperwork-exempt: yes". Set 'log-edit-rewrite-tiny-change'
nil to disable this.
---
scanning of #define'd symbols.
---
- *** New command `hif-evaluate-macro', bound to `C-c @ e', displays the
+ *** New command 'hif-evaluate-macro', bound to 'C-c @ e', displays the
result of evaluating a macro.
---
- *** New command `hif-clear-all-ifdef-define', bound to `C-c @ C', clears
- all defined symbols in `hide-ifdef-env'.
+ *** New command 'hif-clear-all-ifdef-define', bound to 'C-c @ C', clears
+ all defined symbols in 'hide-ifdef-env'.
---
- *** New custom variable `hide-ifdef-header-regexp' to define C/C++ header
- file name patterns. Defaults to files whose extension is one of `.h',
- `.hh', `.hpp', `.hxx', or `.h++', matched case-insensitively.
+ *** New custom variable 'hide-ifdef-header-regexp' to define C/C++ header
+ file name patterns. Defaults to files whose extension is one of '.h',
+ '.hh', '.hpp', '.hxx', or '.h++', matched case-insensitively.
---
- *** New custom variable `hide-ifdef-expand-reinclusion-protection' to prevent
+ *** New custom variable 'hide-ifdef-expand-reinclusion-protection' to prevent
reinclusion protected (a.k.a. "idempotent") header files from being hidden.
(This could happen when an idempotent header file is visited again,
- when its guard symbol is already defined.) Defaults to `t'.
+ when its guard symbol is already defined.) Defaults to 't'.
---
- *** New custom variable `hide-ifdef-exclude-define-regexp' to define symbol
+ *** New custom variable 'hide-ifdef-exclude-define-regexp' to define symbol
name patterns (e.g. all "FOR_DOXYGEN_ONLY_*") to be ignored when
looking for macro definitions. By default, no symbols are ignored.
** TeX mode
+++
- *** New custom variable `tex-print-file-extension' to help users who
+ *** New custom variable 'tex-print-file-extension' to help users who
use PDF instead of DVI.
+++
*** TeX mode now supports Prettify Symbols mode. When enabling
- `prettify-symbols-mode' in a tex-mode buffer, \alpha ... \omega, and
+ 'prettify-symbols-mode' in a tex-mode buffer, \alpha ... \omega, and
many other math macros are displayed using unicode characters.
+++
- ** New `big-indent' style in `whitespace-mode' highlights deep indentation.
+ ** New 'big-indent' style in 'whitespace-mode' highlights deep indentation.
By default, 32 consecutive spaces or four consecutive TABs are
considered to be too deep, but the new variable
- `whitespace-big-indent-regexp' can be customized to change that.
+ 'whitespace-big-indent-regexp' can be customized to change that.
---
- ** New options in `tildify-mode'.
- New options `tildify-space-string', `tildify-pattern', and
- `tildify-foreach-region-function' variables make
- `tildify-string-alist', `tildify-pattern-alist', and
- `tildify-ignored-environments-alist' variables (as well as a few
+ ** New options in 'tildify-mode'.
+ New options 'tildify-space-string', 'tildify-pattern', and
+ 'tildify-foreach-region-function' variables make
+ 'tildify-string-alist', 'tildify-pattern-alist', and
+ 'tildify-ignored-environments-alist' variables (as well as a few
helper functions) obsolete.
+++
while still using the etags.el code that reads the TAGS tables as one
of its back-ends.
- The command `xref-find-definitions' replaces `find-tag' and provides
+ The command 'xref-find-definitions' replaces 'find-tag' and provides
an interface to pick one definition among several.
- `tags-loop-continue' is now unbound. `xref-pop-marker-stack' replaces
- `pop-tag-mark', but has a keybinding (`M-,') different from the one
- `pop-tag-mark' used.
+ 'tags-loop-continue' is now unbound. 'xref-pop-marker-stack' replaces
+ 'pop-tag-mark', but has a keybinding ('M-,') different from the one
+ 'pop-tag-mark' used.
- `xref-find-definitions-other-window' replaces `find-tag-other-window'.
- `xref-find-definitions-other-frame' replaces `find-tag-other-frame'.
- `xref-find-apropos' replaces `find-tag-regexp'.
+ 'xref-find-definitions-other-window' replaces 'find-tag-other-window'.
+ 'xref-find-definitions-other-frame' replaces 'find-tag-other-frame'.
+ 'xref-find-apropos' replaces 'find-tag-regexp'.
As a result of this, the following commands are now obsolete:
- `find-tag-other-window', `find-tag-other-frame', `find-tag-regexp',
- `tags-apropos'.
+ 'find-tag-other-window', 'find-tag-other-frame', 'find-tag-regexp',
+ 'tags-apropos'.
- `tags-loop-continue' is not obsolete because it's still useful in
- `tags-search' and `tags-query-replace', for which there are no direct
+ 'tags-loop-continue' is not obsolete because it's still useful in
+ 'tags-search' and 'tags-query-replace', for which there are no direct
replacements yet.
+++
- *** Variants of `tags-search' and `tags-query-replace' in Dired were also
+ *** Variants of 'tags-search' and 'tags-query-replace' in Dired were also
replaced by xref-style commands, see the "Dired" section below.
+++
*** New variables
- `find-tag-marker-ring-length' is now an obsolete alias for
- `xref-marker-ring-length'. `find-tag-marker-ring' is now an obsolete
- alias for a private variable. `xref-push-marker-stack' and
- `xref-pop-marker-stack' should be used instead to manipulate the stack
+ 'find-tag-marker-ring-length' is now an obsolete alias for
+ 'xref-marker-ring-length'. 'find-tag-marker-ring' is now an obsolete
+ alias for a private variable. 'xref-push-marker-stack' and
+ 'xref-pop-marker-stack' should be used instead to manipulate the stack
of searches for definitions.
---
- *** `xref-find-definitions' and `describe-function' now display
+ *** 'xref-find-definitions' and 'describe-function' now display
information about mode local overrides (defined by cedet/mode-local.el
- `define-overloadable-function' `define-mode-local-overrides').
+ 'define-overloadable-function' 'define-mode-local-overrides').
The framework's Lisp API is still experimental and can change in major,
backward-incompatible ways.
The new package Project provides generic infrastructure for dealing
with projects. The main commands included in it are
- `project-find-file' and `project-find-regexp'.
+ 'project-find-file' and 'project-find-regexp'.
The Lisp API of this package is still experimental.
There have also been customization changes.
+++
- *** New custom variable `eudc-server-hotlist' to allow specifying
+ *** New custom variable 'eudc-server-hotlist' to allow specifying
multiple EUDC servers in init file.
+++
- *** Custom variable `eudc-inline-query-format' defaults to completing
+ *** Custom variable 'eudc-inline-query-format' defaults to completing
on email and firstname instead of surname.
---
- *** Custom variable `eudc-expansion-overwrites-query' defaults to nil
+ *** Custom variable 'eudc-expansion-overwrites-query' defaults to nil
to avoid interfering with the kill ring.
+++
- *** Custom variable `eudc-inline-expansion-format' defaults to
+ *** Custom variable 'eudc-inline-expansion-format' defaults to
"Firstname Surname <mail-address>".
+++
- *** Custom variable `eudc-options-file' defaults to
+ *** Custom variable 'eudc-options-file' defaults to
"~/.emacs.d/eudc-options".
---
- *** New custom variable `ldap-ldapsearch-password-prompt-regexp' to
+ *** New custom variable 'ldap-ldapsearch-password-prompt-regexp' to
allow overriding the regular expression that recognizes the ldapsearch
command line's password prompt.
** Eshell
+++
- *** The new built-in command `clear' can scroll window contents out of sight.
+ *** The new built-in command 'clear' can scroll window contents out of sight.
If provided with an optional non-nil argument, the scrollback contents will be cleared.
+++
*** New buffer syntax '#<buffer-name>', which is equivalent to
'#<buffer buffer-name>'. This shorthand makes interacting with
buffers from eshell more convenient. Custom variable
- `eshell-buffer-shorthand', which has been broken for a while, has been
+ 'eshell-buffer-shorthand', which has been broken for a while, has been
removed.
+++
*** By default, eshell "visual" program buffers (created by
- `eshell-visual-commands' and similar custom vars) are no longer killed
+ 'eshell-visual-commands' and similar custom vars) are no longer killed
when their processes die. This fixes issues with short-lived commands
and makes visual programs more useful in general. For example, if
"git log" is a visual command, it will always show the visual command
buffer, even if the "git log" process dies. For the old behavior,
- make the new option `eshell-destroy-buffer-when-process-dies' non-nil.
+ make the new option 'eshell-destroy-buffer-when-process-dies' non-nil.
** Browse-url
*** Support for several ancient browsers is now officially obsolete.
+++
- ** tar-mode: new `tar-new-entry' command, allowing for new members to
+ ** tar-mode: new 'tar-new-entry' command, allowing for new members to
be added to the archive.
** Autorevert
Emacs is compiled with file notification support.
---
- *** `auto-revert-use-notify' is set to nil in `global-auto-revert-mode'.
+ *** 'auto-revert-use-notify' is set to nil in 'global-auto-revert-mode'.
See <http://debbugs.gnu.org/22814>.
** File Notifications
*** The kqueue library is integrated for *BSD and Mac OS X machines.
+++
- *** The new event `stopped' signals, that a file notification watch is
+ *** The new event 'stopped' signals, that a file notification watch is
not active any longer.
+++
- *** The new function `file-notify-valid-p' checks, whether a file
+ *** The new function 'file-notify-valid-p' checks, whether a file
notification descriptor still corresponds to an activate watch.
** Dired
+++
- *** The command `dired-do-compress' bound to `Z' now can compress
+ *** The command 'dired-do-compress' bound to 'Z' now can compress
directories and decompress zip files.
+++
- *** New command `dired-do-compress-to' bound to `c' can be used to
+ *** New command 'dired-do-compress-to' bound to 'c' can be used to
compress many marked files into a single named archive. The
compression command is determined from the new
- `dired-compress-files-alist' variable.
+ 'dired-compress-files-alist' variable.
+++
- `wdired-create-parent-directories' variable.
+*** In wdired, when editing files to contain slash characters,
+the resulting directories are automatically created. Whether
+to do this or not is controlled by the
- *** `W' is now bound to `browse-url-of-dired-file', and is useful for
++'wdired-create-parent-directories' variable.
+
++++
- *** New user interface for the `A' and `Q' commands.
- These keys, now bound to `dired-do-find-regexp' and
- `dired-do-find-regexp-and-replace', work similarly to `xref-find-apropos'
- and `xref-query-replace-in-results': they present the matches
- in the `*xref*' buffer and let you move through the matches. No need
- to use `tags-loop-continue' to resume the search or replace loop. The
- previous commands, `dired-do-search' and
- `dired-do-query-replace-regexp', are still available, but not bound to
- keys; rebind `A' and `Q' to invoke them if you want the old behavior
++*** 'W' is now bound to 'browse-url-of-dired-file', and is useful for
+viewing HTML files and the like.
+
+ *** New user interface for the 'A' and 'Q' commands.
+ These keys, now bound to 'dired-do-find-regexp' and
+ 'dired-do-find-regexp-and-replace', work similarly to 'xref-find-apropos'
+ and 'xref-query-replace-in-results': they present the matches
+ in the '*xref*' buffer and let you move through the matches. No need
+ to use 'tags-loop-continue' to resume the search or replace loop. The
+ previous commands, 'dired-do-search' and
+ 'dired-do-query-replace-regexp', are still available, but not bound to
+ keys; rebind 'A' and 'Q' to invoke them if you want the old behavior
back. We intend to obsolete the old commands in a future release.
** Tabulated List Mode
+++
- *** It is now safe for a mode that derives `tabulated-list-mode' to not
- call `tabulated-list-init-header', in which case it will have no
+ *** It is now safe for a mode that derives 'tabulated-list-mode' to not
+ call 'tabulated-list-init-header', in which case it will have no
header.
+++
- *** `tabulated-list-print' takes a second optional argument, update,
+ *** 'tabulated-list-print' takes a second optional argument, update,
which specifies an alternative printing method which is faster when
few or no entries have changed.
+++
** cl-generic.el provides CLOS-style multiple-dispatch generic functions.
- The main entry points are `cl-defgeneric' and `cl-defmethod'. See the
+ The main entry points are 'cl-defgeneric' and 'cl-defmethod'. See the
node "Generic Functions" in the Emacs Lisp manual for more details.
---
let-bind the values stored in an alist.
---
- ** `tildify-mode' allows automatic insertion of hard spaces as one
+ ** 'tildify-mode' allows automatic insertion of hard spaces as one
types the text. Breaking line after a single-character words is
forbidden by Czech and Polish typography (and may be discouraged in
- other languages), so `auto-tildify-mode' makes it easier to create
+ other languages), so 'auto-tildify-mode' makes it easier to create
a typographically-correct documents.
---
- ** The `seq' library adds sequence manipulation functions and macros
+ ** The 'seq' library adds sequence manipulation functions and macros
that complement basic functions provided by subr.el. All functions
- are prefixed with `seq-' and work on lists, strings and vectors.
- `pcase' accepts a new Upattern `seq'.
+ are prefixed with 'seq-' and work on lists, strings and vectors.
+ 'pcase' accepts a new Upattern 'seq'.
---
- ** The `map' library provides map-manipulation functions that work on
+ ** The 'map' library provides map-manipulation functions that work on
alists, hash-table and arrays. All functions are prefixed with
- `map-'. `pcase' accepts a new UPattern `map'.
+ 'map-'. 'pcase' accepts a new UPattern 'map'.
---
- ** The `thunk' library provides functions and macros to control the
+ ** The 'thunk' library provides functions and macros to control the
evaluation of forms.
---
* Incompatible Lisp Changes in Emacs 25.1
---
- ** `setq' and `setf' must now be called with an even number of
+ ** 'setq' and 'setf' must now be called with an even number of
arguments. The earlier behavior of silently supplying a nil to the
last variable when there was an odd number of arguments has been
eliminated.
+++
- ** `syntax-begin-function' is declared obsolete.
+ ** 'syntax-begin-function' is declared obsolete.
Removed font-lock-beginning-of-syntax-function and the SYNTAX-BEGIN
slot in font-lock-defaults.
+++
** The new implementation of Subword mode affects word movement everywhere.
- When Subword mode is turned on, `forward-word', `backward-word', and
+ When Subword mode is turned on, 'forward-word', 'backward-word', and
everything that uses them will move by sub-words, effectively
overriding the buffer's syntax table. Lisp programs that shouldn't be
affected by Subword mode should call the new functions
- `forward-word-strictly' and `backward-word-strictly' instead.
+ 'forward-word-strictly' and 'backward-word-strictly' instead.
+++
- ** `package-initialize' now sets `package-enable-at-startup' to nil if
+ ** 'package-initialize' now sets 'package-enable-at-startup' to nil if
called during startup. Users who call this function in their init
file and still expect it to be run after startup should set
- `package-enable-at-startup' to t after the call to
- `package-initialize'.
+ 'package-enable-at-startup' to t after the call to
+ 'package-initialize'.
---
- ** `:global' minor mode use `setq-default' rather than `setq'.
- This means that you can't use `make-local-variable' and expect them to
+ ** ':global' minor mode use 'setq-default' rather than 'setq'.
+ This means that you can't use 'make-local-variable' and expect them to
"magically" become buffer-local.
+++
- ** `track-mouse' no longer freezes the shape of the mouse pointer.
- The `track-mouse' form no longer refrains from changing the shape of
+ ** 'track-mouse' no longer freezes the shape of the mouse pointer.
+ The 'track-mouse' form no longer refrains from changing the shape of
the mouse pointer for the entire time the body of that form is
- executed. Lisp programs that use `track-mouse' for dragging across
+ executed. Lisp programs that use 'track-mouse' for dragging across
large portions of the Emacs display, and want to avoid changes in the
- pointer shape during dragging, should bind the variable `track-mouse'
- to the special value `dragging' in the body of the form.
+ pointer shape during dragging, should bind the variable 'track-mouse'
+ to the special value 'dragging' in the body of the form.
---
- ** The optional `predicate' argument of `lisp-complete-symbol' no longer
+ ** The optional 'predicate' argument of 'lisp-complete-symbol' no longer
has any effect. (This change was made in Emacs 24.4 but was not
advertised at the time.)
+++
- ** `indirect-function' does not signal `void-function' any more.
+ ** 'indirect-function' does not signal 'void-function' any more.
This is mostly a bug-fix, since this change was missed back in 24.4 when
- symbol-function was changed not to signal `void-function' any more.
+ symbol-function was changed not to signal 'void-function' any more.
+++
- *** As a consequence, the second arg of `indirect-function' is now obsolete.
+ *** As a consequence, the second arg of 'indirect-function' is now obsolete.
+++
** Comint, term, and compile do not set the EMACS env var any more.
Use the INSIDE_EMACS environment variable instead.
- ** `C-up', `C-down', `C-left' and `C-right' are now defined in term
++** 'C-up', 'C-down', 'C-left' and 'C-right' are now defined in term
+mode to send the same escape sequences that xterm does. This makes
+things like forward-word in readline work.
+
+---
+** hideshow mode got four key bindings that are analogous to outline
- mode bindings: `C-c @ C-a', `C-c @ C-t', `C-c @ C-d', and `C-c @ C-e.'
++mode bindings: 'C-c @ C-a', 'C-c @ C-t', 'C-c @ C-d', and 'C-c @ C-e.'
+
+++
- ** `save-excursion' does not save&restore the mark any more.
- Use `save-mark-and-excursion' if you want the old behavior.
+ ** 'save-excursion' does not save&restore the mark any more.
+ Use 'save-mark-and-excursion' if you want the old behavior.
+++
- ** `read-buffer' and `read-buffer-function' can now be called with a 4th
- argument (`predicate').
+ ** 'read-buffer' and 'read-buffer-function' can now be called with a 4th
+ argument ('predicate').
+++
- ** `completion-table-dynamic' by default stays in the minibuffer.
+ ** 'completion-table-dynamic' by default stays in the minibuffer.
The minibuffer will be the current buffer when the function is called.
If you want the old behavior of calling the function in the buffer
from which the minibuffer was entered, use the new argument
- `switch-buffer' to `completion-table-dynamic'.
+ 'switch-buffer' to 'completion-table-dynamic'.
---
** window-configurations no longer record the buffers' marks.
** deactivate-mark is now buffer-local.
+++
- ** `cl-the' now asserts that its argument is of the given type.
+ ** 'cl-the' now asserts that its argument is of the given type.
+++
- ** `process-running-child-p' may now return a numeric process
- group ID instead of `t'.
+ ** 'process-running-child-p' may now return a numeric process
+ group ID instead of 't'.
+++
** Mouse click events on mode line or header line no longer include
in languages like German where downcasing rules depend on grammar.
+++
- ** New variable ‘text-quoting-style’ to control how Emacs translates quotes.
- Set it to ‘curve’ for curved single quotes ‘like this’, to ‘straight’
- for straight apostrophes 'like this', and to ‘grave’ for grave accent
- and apostrophe `like this'. The default value nil acts like ‘curve’
- if curved single quotes are displayable, and like ‘grave’ otherwise.
- The new variable affects display of diagnostics and help, but not of info.
+ ** New variable 'text-quoting-style' to control how Emacs translates quotes.
+ Set it to 'curve' for curved single quotes, to 'straight' for straight
+ apostrophes, and to 'grave' for grave accent and apostrophe. The
+ default value nil acts like 'curve' if curved single quotes are
+ displayable, and like 'grave' otherwise. The new variable affects
+ display of diagnostics and help, but not of info.
+++
** substitute-command-keys now replaces quotes.
- That is, it converts documentation strings’ quoting style as per the
- value of ‘text-quoting-style’. Doc strings in source code can use
+ That is, it converts documentation strings' quoting style as per the
+ value of 'text-quoting-style'. Doc strings in source code can use
either curved single quotes or grave accents and apostrophes. As
before, characters preceded by \= are output as-is.
+++
- ** Message-issuing functions ‘error’, ‘message’, etc. now convert quotes.
- They use the new ‘format-message’ function instead of plain ‘format’,
- so that they now follow user preference as per ‘text-quoting-style’
+ ** Message-issuing functions 'error', 'message', etc. now convert quotes.
+ They use the new 'format-message' function instead of plain 'format',
+ so that they now follow user preference as per 'text-quoting-style'
when processing curved single quotes, grave accents, and apostrophes
in their format argument.
** The character classes [:alpha:] and [:alnum:] in regular expressions
now match multibyte characters using Unicode character properties.
If you want the old behavior where they matched any character with
- word syntax, use `\sw' instead.
+ word syntax, use '\sw' instead.
+++
** The character classes [:graph:] and [:print:] in regular expressions
use [:multibyte:] instead.
+++
- ** The `diff' command uses the unified format now. To restore the old
- behavior, set `diff-switches' to `-c'.
+ ** The 'diff' command uses the unified format now. To restore the old
+ behavior, set 'diff-switches' to '-c'.
---
- ** `grep-template' and `grep-find-template' values don't include the
+ ** 'grep-template' and 'grep-find-template' values don't include the
--color argument anymore. It's added at the <C> place holder position
dynamically. Any third-party code that changes these templates should
be updated accordingly.
- before running. This is controlled by the `grep-save-buffers'
+** The grep/rgrep/lgrep functions will now ask about saving files
++before running. This is controlled by the 'grep-save-buffers'
+variable.
+
+++
- ** ‘(/ N)’ is now equivalent to ‘(/ 1 N)’ rather than to ‘(/ N 1)’.
+ ** '(/ N)' is now equivalent to '(/ 1 N)' rather than to '(/ N 1)'.
The new behavior is compatible with Common Lisp and with XEmacs.
This change does not affect Lisp code intended to be portable to
- Emacs 24.2 and earlier, which did not support unary ‘/’.
+ Emacs 24.2 and earlier, which did not support unary '/'.
+++
- ** The `default-directory' value doesn't have to end slash. To make
- that happen, `unhandled-file-name-directory' now defaults to calling
- `file-name-as-directory'.
+ ** The 'default-directory' value doesn't have to end slash. To make
+ that happen, 'unhandled-file-name-directory' now defaults to calling
+ 'file-name-as-directory'.
\f
* Lisp Changes in Emacs 25.1
** pcase
+++
- *** New UPatterns `quote', `app'.
+ *** New UPatterns 'quote', 'app'.
+++
- *** New UPatterns can be defined with `pcase-defmacro'.
+ *** New UPatterns can be defined with 'pcase-defmacro'.
+++
*** New vector QPattern.
---
** syntax-propertize is now automatically called on-demand during forward
- parsing functions like `forward-sexp'.
+ parsing functions like 'forward-sexp'.
+++
- ** New hooks `prefix-command-echo-keystrokes-functions' and
- `prefix-command-preserve-state-hook' allow the definition of prefix
- commands other than the predefined `C-u'.
+ ** New hooks 'prefix-command-echo-keystrokes-functions' and
+ 'prefix-command-preserve-state-hook' allow the definition of prefix
+ commands other than the predefined 'C-u'.
+++
- ** New functions `filepos-to-bufferpos' and `bufferpos-to-filepos'.
+ ** New functions 'filepos-to-bufferpos' and 'bufferpos-to-filepos'.
These allow conversion between buffer positions and the corresponding
file byte offsets, given the file's encoding.
+++
- ** The default value of `load-read-function' is now `read'.
- Previously, the default value of `nil' implied using `read'.
+ ** The default value of 'load-read-function' is now 'read'.
+ Previously, the default value of 'nil' implied using 'read'.
+++
- ** New hook `pre-redisplay-functions'.
- It is a bit easier to use than `pre-redisplay-function'.
+ ** New hook 'pre-redisplay-functions'.
+ It is a bit easier to use than 'pre-redisplay-function'.
+++
- ** The second arg of `looking-back' should always be provided explicitly.
+ ** The second arg of 'looking-back' should always be provided explicitly.
Previously, it was an optional argument, now it's mandatory.
+++
- ** Text properties `intangible', `point-entered', and `point-left' are obsolete.
- Replaced by properties `cursor-intangible' and `cursor-sensor-functions',
- implemented by the new `cursor-intangible-mode' and
- `cursor-sensor-mode' minor modes.
+ ** Text properties 'intangible', 'point-entered', and 'point-left' are obsolete.
+ Replaced by properties 'cursor-intangible' and 'cursor-sensor-functions',
+ implemented by the new 'cursor-intangible-mode' and
+ 'cursor-sensor-mode' minor modes.
+++
- ** `inhibit-point-motion-hooks' now defaults to `t' and is obsolete.
- Use the new minor modes `cursor-intangible-mode' and
- `cursor-sensor-mode' instead.
+ ** 'inhibit-point-motion-hooks' now defaults to 't' and is obsolete.
+ Use the new minor modes 'cursor-intangible-mode' and
+ 'cursor-sensor-mode' instead.
+++
- ** New process type `pipe', which can be used in combination with the
- `:stderr' keyword of make-process to handle standard error output
+ ** New process type 'pipe', which can be used in combination with the
+ ':stderr' keyword of make-process to handle standard error output
of subprocess.
+++
- ** New function `make-process' provides an alternative interface to
- `start-process'. It allows programs to set process parameters such as
+ ** New function 'make-process' provides an alternative interface to
+ 'start-process'. It allows programs to set process parameters such as
process filter, sentinel, etc., through keyword arguments (similar to
- `make-network-process').
+ 'make-network-process').
+++
- ** A new function `directory-files-recursively' returns all matching
+ ** A new function 'directory-files-recursively' returns all matching
files (recursively) under a directory.
+++
- ** New variable `inhibit-message', when bound to non-nil, inhibits
- `message' and related functions from displaying messages in the echo
+ ** New variable 'inhibit-message', when bound to non-nil, inhibits
+ 'message' and related functions from displaying messages in the echo
area. The output is still logged to the *Messages* buffer.
+++
- ** A new text property `inhibit-read-only' can be used in read-only
+ ** A new text property 'inhibit-read-only' can be used in read-only
buffers to allow certain parts of the text to be writable.
+++
- ** A new variable `comment-end-can-be-escaped' is useful in languages
+ ** A new variable 'comment-end-can-be-escaped' is useful in languages
such as C and C++ where line comments with escaped newlines are
continued to the next line.
+++
- ** New macro `define-advice'.
+ ** New macro 'define-advice'.
+++
** Emacs Lisp now supports generators.
It should be placed right where the docstring would be, and FORM is then
evaluated (and should return a string) when the closure is built.
- ** The new command `fortune-message' has been added, which displays
+---
++** The new command 'fortune-message' has been added, which displays
+fortunes in the echo area.
+
+++
** define-inline provides a new way to define inlinable functions.
+++
- ** New function `macroexpand-1' to perform a single step of macro expansion.
+ ** New function 'macroexpand-1' to perform a single step of macro expansion.
+++
** Some "x-*" functions were obsoleted and/or renamed:
*** x-set-selection is renamed to gui-set-selection
+++
- ** New function `string-greaterp', which return the opposite result of
- `string-lessp'.
+ ** New function 'string-greaterp', which return the opposite result of
+ 'string-lessp'.
+++
- ** The new functions `string-collate-lessp' and `string-collate-equalp'
+ ** The new functions 'string-collate-lessp' and 'string-collate-equalp'
preserve the collation order as defined by the system's locale(1)
environment. For the time being this is implemented for modern POSIX
systems and for MS-Windows, for other systems they fall back to their
- counterparts `string-lessp' and `string-equal'.
+ counterparts 'string-lessp' and 'string-equal'.
- ** The new function `string-version-lessp' compares strings by
++++
++** The new function 'string-version-lessp' compares strings by
+interpreting consecutive runs of numerical characters as numbers, and
+compares their numerical values. According to this predicate,
+"foo2.png" is smaller than "foo12.png".
+
---
- *** The ls-lisp package uses `string-collate-lessp' to sort file names.
+ *** The ls-lisp package uses 'string-collate-lessp' to sort file names.
The effect is that, on systems that use ls-lisp for Dired, the default
sort order of the files in Dired is now different from what it was in
previous versions of Emacs. In particular, the file names are sorted
ignored. For example, files whose name begin with a period will no
longer appear near the beginning of the directory listing. If you
want the old, locale-independent sorting, customize the new option
- `ls-lisp-use-string-collate' to the nil value.
+ 'ls-lisp-use-string-collate' to the nil value.
+++
- *** The MS-Windows specific variable `w32-collate-ignore-punctuation',
+ *** The MS-Windows specific variable 'w32-collate-ignore-punctuation',
if set to a non-nil value, causes the above 2 functions to ignore
symbol and punctuation characters when collating strings. This
emulates the behavior of modern Posix platforms when the locale's
MS-Windows doesn't support UTF-8 as codeset in its locales.
+++
- ** New function `alist-get', which is also a valid place (aka lvalue).
+ ** New function 'alist-get', which is also a valid place (aka lvalue).
+++
- ** New function `funcall-interactively', which works like `funcall'
- but makes `called-interactively-p' treat the function as (you guessed it)
+ ** New function 'funcall-interactively', which works like 'funcall'
+ but makes 'called-interactively-p' treat the function as (you guessed it)
called interactively.
+++
- ** New function `function-put' to use instead of `put' for function properties.
+ ** New function 'function-put' to use instead of 'put' for function properties.
+++
- ** The new function `bidi-find-overridden-directionality' allows you to
+ ** The new function 'bidi-find-overridden-directionality' allows you to
find characters whose directionality was, perhaps maliciously,
overridden by directional override control characters. Lisp programs
can use this to detect potential phishing of URLs and other links that
exploits bidirectional display reordering.
+++
- ** The new function `buffer-substring-with-bidi-context' allows you to
+ ** The new function 'buffer-substring-with-bidi-context' allows you to
copy a portion of a buffer into a different location while preserving
the visual appearance both of the copied text and the text at
destination, even when the copied text includes mixed bidirectional
text and directional control characters.
+++
- ** New properties that can be specified with `declare':
+ ** New properties that can be specified with 'declare':
*** (interactive-only INSTEAD), says to use INSTEAD for non-interactive use.
*** (pure VAL), if VAL is non-nil, indicates the function is pure.
*** (side-effect-free VAL), if VAL is non-nil, indicates the function does not
have side effects.
+++
- ** New macro `with-file-modes', for evaluating expressions with default file
+ ** New macro 'with-file-modes', for evaluating expressions with default file
permissions set to temporary values (e.g., for creating private files).
+++
- ** You can access the slots of structures using `cl-struct-slot-value'.
+ ** You can access the slots of structures using 'cl-struct-slot-value'.
+++
- ** Function `sort' can deal with vectors.
+ ** Function 'sort' can deal with vectors.
---
- ** Function `system-name' now returns an updated value if the current
+ ** Function 'system-name' now returns an updated value if the current
system's name has changed or if the Emacs process has changed systems,
and to avoid long waits it no longer consults DNS to canonicalize the
- name. The variable `system-name' is now obsolete.
+ name. The variable 'system-name' is now obsolete.
+++
- ** Function `write-region' no longer outputs "Wrote FILE" in batch mode.
+ ** Function 'write-region' no longer outputs "Wrote FILE" in batch mode.
---
- ** If `pwd' is called with a prefix argument, insert the current default
+ ** If 'pwd' is called with a prefix argument, insert the current default
directory at point.
+++
** New functions return extended information about fonts and faces.
+++
- *** The function `font-info' now returns more details about a font.
+ *** The function 'font-info' now returns more details about a font.
In particular, it now returns the average width of the font's
characters, which can be used for geometry-related calculations.
+++
- *** A new function `default-font-width' returns the average width of a
+ *** A new function 'default-font-width' returns the average width of a
character in the current buffer's default font. If the default face
- is remapped (see `face-remapping-alist'), the value for the remapped
+ is remapped (see 'face-remapping-alist'), the value for the remapped
face is returned. This function complements the existing function
- `default-font-height'.
+ 'default-font-height'.
+++
- *** New functions `window-font-height' and `window-font-width' return
+ *** New functions 'window-font-height' and 'window-font-width' return
the height and average width of characters in a specified face and
- window. If FACE is remapped (see `face-remapping-alist'), the
+ window. If FACE is remapped (see 'face-remapping-alist'), the
function returns the information for the remapped face.
+++
- *** A new function `window-max-chars-per-line' returns the maximal
+ *** A new function 'window-max-chars-per-line' returns the maximal
number of characters that can be displayed on one line. If a face
and/or window are provided, these values are used for the
- calculation. This function is different from `window-body-width' in
+ calculation. This function is different from 'window-body-width' in
that it accounts for (i) continuation glyphs, (ii) the size of the
font, and (iii) the specified window.
---
** New utilities in subr-x.el:
- *** New macros `if-let' and `when-let' allow defining bindings and to
+ *** New macros 'if-let' and 'when-let' allow defining bindings and to
execute code depending whether all values are true.
- *** New macros `thread-first' and `thread-last' allow threading a form
+ *** New macros 'thread-first' and 'thread-last' allow threading a form
as the first or last argument of subsequent forms.
+++
** Documentation strings now support quoting with curved single quotes
- ‘like-this’ in addition to the old style with grave accent and
- apostrophe `like-this'. The new style looks better on today's displays.
- In the new Electric Quote mode, you can enter curved single quotes
- into documentation by typing ` and '. Outside Electric Quote mode,
- you can enter them by typing ‘C-x 8 [’ and ‘C-x 8 ]’, or (if your Alt
- key works) by typing ‘A-[’ and ‘A-]’. As described above under
- ‘text-quoting-style’, the user can specify how to display doc string
+ in addition to the old style with grave accent and apostrophe. The
+ new style looks better on today's displays. In the new Electric Quote
+ mode, you can enter curved single quotes into documentation by typing
+ grave accent and apostrophe. Outside Electric Quote mode, you can
+ enter them by typing 'C-x 8 [' and 'C-x 8 ]', or (if your Alt key
+ works) by typing 'A-[' and 'A-]'. As described above under
+ 'text-quoting-style', the user can specify how to display doc string
quotes.
+++
- ** New function ‘format-message’ is like ‘format’ and also converts
+ ** New function 'format-message' is like 'format' and also converts
curved single quotes, grave accents and apostrophes as per
- ‘text-quoting-style’.
+ 'text-quoting-style'.
+++
** show-help-function's arg is converted via substitute-command-keys
*** Time conversion functions now accept an optional ZONE argument
that specifies the time zone rules for conversion. ZONE is omitted or
- nil for Emacs local time, t for Universal Time, ‘wall’ for system wall
- clock time, or a string as in ‘set-time-zone-rule’ for a time zone
- rule. The affected functions are ‘current-time-string’,
- ‘current-time-zone’, ‘decode-time’, and ‘format-time-string’. The
- function ‘encode-time’, which already accepted a simple time zone rule
+ nil for Emacs local time, t for Universal Time, 'wall' for system wall
+ clock time, or a string as in 'set-time-zone-rule' for a time zone
+ rule. The affected functions are 'current-time-string',
+ 'current-time-zone', 'decode-time', and 'format-time-string'. The
+ function 'encode-time', which already accepted a simple time zone rule
argument, has been extended to accept all the new forms.
*** Time-related functions now consistently accept numbers
(representing seconds since the epoch) and nil (representing the
current time) as well as the usual list-of-integer representation.
- Affected functions include `current-time-string', `current-time-zone',
- `decode-time', `float-time', `format-time-string', `seconds-to-time',
- `time-add', `time-less-p', `time-subtract', `time-to-day-in-year',
- `time-to-days', and `time-to-seconds'.
+ Affected functions include 'current-time-string', 'current-time-zone',
+ 'decode-time', 'float-time', 'format-time-string', 'seconds-to-time',
+ 'time-add', 'time-less-p', 'time-subtract', 'time-to-day-in-year',
+ 'time-to-days', and 'time-to-seconds'.
- *** The `encode-time-value' and `with-decoded-time-value' macros have
+ *** The 'encode-time-value' and 'with-decoded-time-value' macros have
been obsoleted.
- *** `calendar-next-time-zone-transition', `time-add', and
- `time-subtract' no longer return time values in the obsolete and
+ *** 'calendar-next-time-zone-transition', 'time-add', and
+ 'time-subtract' no longer return time values in the obsolete and
undocumented integer-pair format. Instead, they return a list of two
integers.
+++
- ** New function `set-binary-mode' allows switching a standard stream
+ ** New function 'set-binary-mode' allows switching a standard stream
of the Emacs process to binary I/O mode.
+++
- ** The new function `directory-name-p' can be used to check whether a file
- name (as returned from, for instance, `file-name-all-completions') is
+ ** The new function 'directory-name-p' can be used to check whether a file
+ name (as returned from, for instance, 'file-name-all-completions') is
a directory file name. It returns non-nil if the last character in
the name is a directory separator character (forward slash on GNU and
Unix systems, forward- or backslash on MS-Windows and MS-DOS).
+++
** Standard output and error streams now transliterate characters via
standard-display-table, and encode output using locale-coding-system.
- To force a specific encoding, bind `coding-system-for-write' to the
- coding-system of your choice when invoking functions like `prin1' and
- `message'.
+ To force a specific encoding, bind 'coding-system-for-write' to the
+ coding-system of your choice when invoking functions like 'prin1' and
+ 'message'.
+++
- ** New var `truncate-string-ellipsis' to choose how to indicate truncation.
+ ** New var 'truncate-string-ellipsis' to choose how to indicate truncation.
+++
- ** New possible value for `system-type': `nacl'.
+ ** New possible value for 'system-type': 'nacl'.
This is used by Google's Native Client (NaCl).
- ** `read-color' will now display the color names using the color itself
+---
- ** There is now a new variable `flyspell-sort-corrections-function'
++** 'read-color' will now display the color names using the color itself
+as the background color.
+
+---
++** There is now a new variable 'flyspell-sort-corrections-function'
+that allows changing the way corrections are sorted.
+
** Miscellaneous name change
---
For consistency with the usual Emacs spelling, the Lisp variable
- `hfy-optimisations' has been renamed to `hfy-optimizations'.
+ 'hfy-optimisations' has been renamed to 'hfy-optimizations'.
The old name should still work, as an obsolescent alias.
** Changes in Frame- and Window- Handling
provide toolkit scroll bars, namely Gtk+, Lucid, Motif and Windows.
Horizontal scroll bars are turned off by default.
- **** New function `horizontal-scroll-bars-available-p' telling whether
+ **** New function 'horizontal-scroll-bars-available-p' telling whether
horizontal scroll bars are available on the underlying system.
- **** New mode `horizontal-scroll-bar-mode' to toggle horizontal scroll
+ **** New mode 'horizontal-scroll-bar-mode' to toggle horizontal scroll
bars on all existing and future frames.
- **** New function `toggle-horizontal-scroll-bar' to toggle horizontal
+ **** New function 'toggle-horizontal-scroll-bar' to toggle horizontal
scroll bars on the selected frame.
- **** New frame parameters `horizontal-scroll-bars' and
- `scroll-bar-height' to set horizontal scroll bars and their height
- for individual frames and in `default-frame-alist'.
+ **** New frame parameters 'horizontal-scroll-bars' and
+ 'scroll-bar-height' to set horizontal scroll bars and their height
+ for individual frames and in 'default-frame-alist'.
- **** New functions `frame-scroll-bar-height' and
- `window-scroll-bar-height' return the height of horizontal scroll
+ **** New functions 'frame-scroll-bar-height' and
+ 'window-scroll-bar-height' return the height of horizontal scroll
bars on a specific frame or window.
- **** `set-window-scroll-bars' now accepts five parameters where the last
+ **** 'set-window-scroll-bars' now accepts five parameters where the last
two specify height and type of the window's horizontal scroll bar.
- **** `window-scroll-bars' now returns type and sizes of horizontal scroll
+ **** 'window-scroll-bars' now returns type and sizes of horizontal scroll
bars too.
- **** New buffer-local variables `horizontal-scroll-bar' and
- `scroll-bar-height'.
+ **** New buffer-local variables 'horizontal-scroll-bar' and
+ 'scroll-bar-height'.
+++
- *** New functions `frame-geometry' and `frame-edges' give access to a
+ *** New functions 'frame-geometry' and 'frame-edges' give access to a
frame's geometry.
+++
- *** New functions `mouse-absolute-pixel-position' and
- `set-mouse-absolute-pixel-position' get/set screen coordinates of the
+ *** New functions 'mouse-absolute-pixel-position' and
+ 'set-mouse-absolute-pixel-position' get/set screen coordinates of the
mouse cursor.
+++
- *** The function `window-edges' now accepts three additional arguments to
+ *** The function 'window-edges' now accepts three additional arguments to
retrieve body, absolute and pixel edges of the window.
+++
- *** The functions `window-inside-edges', `window-inside-pixel-edges' and
- `window-inside-absolute-pixel-edges' have been renamed to respectively
- `window-body-edges', `window-body-pixel-edges' and
- `window-absolute-body-pixel-edges'. The old names are kept as aliases.
+ *** The functions 'window-inside-edges', 'window-inside-pixel-edges' and
+ 'window-inside-absolute-pixel-edges' have been renamed to respectively
+ 'window-body-edges', 'window-body-pixel-edges' and
+ 'window-absolute-body-pixel-edges'. The old names are kept as aliases.
+++
- *** New function `window-absolute-pixel-position' to get the screen
+ *** New function 'window-absolute-pixel-position' to get the screen
coordinates of a visible buffer position.
+++
scroll bars. In particular, maximized and fullscreen frames are
conceptually never resized if such settings change. For fullheight and
fullwidth frames, the behavior may depend on the toolkit used.
- **** New option `frame-inhibit-implied-resize' if non-nil, means that
+ **** New option 'frame-inhibit-implied-resize' if non-nil, means that
setting default font, menu bar, fringe width, or scroll bars of a
specific frame does not resize that frame in order to preserve the
number of columns or lines it displays.
+++
- *** New function `window-preserve-size' allows you to preserve the size of
- a window without "fixing" it. It's supported by `fit-window-to-buffer',
- `temp-buffer-resize-mode' and `display-buffer'.
+ *** New function 'window-preserve-size' allows you to preserve the size of
+ a window without "fixing" it. It's supported by 'fit-window-to-buffer',
+ 'temp-buffer-resize-mode' and 'display-buffer'.
+++
- *** New `display-buffer' action function `display-buffer-use-some-frame'.
+ *** New 'display-buffer' action function 'display-buffer-use-some-frame'.
This displays the buffer in an existing frame other than the current
frame, and allows the caller to specify a frame predicate to exclude
frames.
+++
- *** New minor mode `window-divider-mode' and options
- `window-divider-default-places', `window-divider-default-bottom-width'
- and `window-divider-default-right-width'.
+ *** New minor mode 'window-divider-mode' and options
+ 'window-divider-default-places', 'window-divider-default-bottom-width'
+ and 'window-divider-default-right-width'.
---
** Tearoff menus and detachable toolbars for Gtk+ have been removed.
+++
*** etags no longer qualifies class members by default.
- By default, `etags' will not qualify class members for Perl and C-like
+ By default, 'etags' will not qualify class members for Perl and C-like
object-oriented languages with their class names and namespaces, and
will remove qualifications used explicitly in the code from the tag
names it puts in TAGS files. This is so the etags.el back-end for
- `xref-find-definitions' is more accurate and produces less false
+ 'xref-find-definitions' is more accurate and produces less false
positives.
Use --class-qualify (-Q) if you want the old default behavior of
qualifying class members in C++, Java, Objective C, and Perl. Note
- that using -Q might make some class members become "unknown" to `M-.'
- (`xref-find-definitions'); if so, you can use `C-u M-.' to specify the
+ that using -Q might make some class members become "unknown" to 'M-.'
+ ('xref-find-definitions'); if so, you can use 'C-u M-.' to specify the
qualified names by hand.
+++
This includes the makefile.w32-in files in various subdirectories, and
the support files. The file nt/configure.bat now just tells the user
to use the procedure described in nt/INSTALL, by running the Posix
- `configure' script in the top-level directory.
+ 'configure' script in the top-level directory.
---
** Building Emacs for MS-Windows requires at least Windows XP
** OS X on PowerPC is no longer supported.
---
- ** New variable `ns-use-fullscreen-animation' controls animation for
+ ** New variable 'ns-use-fullscreen-animation' controls animation for
non-native NS fullscreen. The default is nil. Set to t to enable
animation when entering and leaving fullscreen. For native OSX fullscreen
this has no effect.
** The new function 'w32-application-type' returns the type of an
MS-Windows application given the name of its executable program file.
- ** New variable `w32-pipe-buffer-size'.
+ ** New variable 'w32-pipe-buffer-size'.
It can be used to tune the size of the buffer of pipes created for
communicating with subprocesses, when the program run by a subprocess
exhibits unusual buffering behavior. Default is zero, which lets the
\f
Local variables:
- coding: utf-8
+ coding: us-ascii
mode: outline
paragraph-separate: "[ \f]*$"
end:
(interactive)
(if (file-exists-p dired-local-variables-file)
(error "Old-style dired-local-variables-file `./%s' found;
- replace it with a dir-locals-file `./%s.el'"
+ replace it with a dir-locals-file `./%s'"
dired-local-variables-file
dir-locals-file))
- (if (dir-locals--all-files default-directory)
- (message "File `./%s' already exists."
- (car (dir-locals--all-files default-directory)))
+ (if (file-exists-p dir-locals-file)
+ (message "File `./%s' already exists." dir-locals-file)
(add-dir-local-variable 'dired-mode 'subdirs nil)
(add-dir-local-variable 'dired-mode 'dired-omit-mode t)
;; Run extra-hooks and revert directory.
;; Local Variables:
;; byte-compile-dynamic: t
-;; generated-autoload-file: "dired.el"
+;; generated-autoload-file: "dired-loaddefs.el"
;; End:
;;; dired-x.el ends here
(require 'gnus-util)
(require 'epg)
+(require 'epa)
(require 'password-cache)
(require 'mm-encode)
(autoload 'mml1991-encrypt "mml1991")
(autoload 'message-fetch-field "message")
(autoload 'message-goto-body "message")
+ (autoload 'message-options-get "message")
(autoload 'mml-insert-tag "mml")
(autoload 'mml-smime-sign "mml-smime")
(autoload 'mml-smime-encrypt "mml-smime")
(autoload 'mml-smime-verify "mml-smime")
(autoload 'mml-smime-verify-test "mml-smime")
(autoload 'epa--select-keys "epa")
+(autoload 'message-options-get "message")
+(autoload 'message-options-set "message")
+ (declare-function message-options-set "message" (symbol value))
+
(defvar mml-sign-alist
'(("smime" mml-smime-sign-buffer mml-smime-sign-query)
("pgp" mml-pgp-sign-buffer list)
:group 'message
:type 'boolean)
+ ;; FIXME If it's "NOT recommended", why is it the default?
(defcustom mml-secure-cache-passphrase password-cache
"If t, cache OpenPGP or S/MIME passphrases inside Emacs.
Passphrase caching in Emacs is NOT recommended. Use gpg-agent instead.
(let* ((usage-prefs (mml-secure-cust-usage-lookup context usage))
(curr-fprs (cdr (assoc name (cdr usage-prefs))))
(key-fprs (mapcar 'mml-secure-fingerprint keys))
- (new-fprs (gnus-union curr-fprs key-fprs :test 'equal)))
+ (new-fprs (cl-union curr-fprs key-fprs :test 'equal)))
(if curr-fprs
(setcdr (assoc name (cdr usage-prefs)) new-fprs)
(setcdr usage-prefs (cons (cons name new-fprs) (cdr usage-prefs))))
The passphrase is read and cached."
;; Based on mml2015-epg-passphrase-callback.
(if (eq key-id 'SYM)
- (epg-passphrase-callback-function context key-id nil)
+ (epa-passphrase-callback-function context key-id nil)
(let* ((password-cache-key-id
(if (eq key-id 'PIN)
"PIN"
;; In contrast, signing requires secret key.
(mml-secure-secret-key-exists-p context subkey))
(or (not fingerprint)
- (gnus-string-match-p (concat fingerprint "$") fpr)
- (gnus-string-match-p (concat fingerprint "$")
- (epg-sub-key-fingerprint subkey))))
+ (string-match-p (concat fingerprint "$") fpr)
+ (string-match-p (concat fingerprint "$")
+ (epg-sub-key-fingerprint subkey))))
(throw 'break t)))))))
(defun mml-secure-find-usable-keys (context name usage &optional justone)
cipher signers)
(when sign
(setq signers (mml-secure-signers context signer-names))
- (epg-context-set-signers context signers))
+ (setf (epg-context-signers context) signers))
(when (eq 'OpenPGP protocol)
- (epg-context-set-armor context t)
- (epg-context-set-textmode context t))
+ (setf (epg-context-armor context) t)
+ (setf (epg-context-textmode context) t))
(when (mml-secure-cache-passphrase-p protocol)
(epg-context-set-passphrase-callback
context
(signers (mml-secure-signers context signer-names))
signature micalg)
(when (eq 'OpenPGP protocol)
- (epg-context-set-armor context t)
- (epg-context-set-textmode context t))
- (epg-context-set-signers context signers)
+ (setf (epg-context-armor context) t)
+ (setf (epg-context-textmode context) t))
+ (setf (epg-context-signers context) signers)
(when (mml-secure-cache-passphrase-p protocol)
(epg-context-set-passphrase-callback
context
(if (eq 'OpenPGP protocol)
(epg-sign-string context (buffer-string) mode)
(epg-sign-string context
- (mm-replace-in-string (buffer-string)
- "\n" "\r\n") t))
+ (replace-regexp-in-string
+ "\n" "\r\n" (buffer-string))
+ t))
mml-secure-secret-key-id-list nil)
(error
(mml-secure-clear-secret-key-id-list)
(autoload 'message-narrow-to-headers "message")
(autoload 'message-fetch-field "message")
-;; Prefer epg over openssl if it is available as epg uses GnuPG's gpgsm,
+;; Prefer epg over openssl as epg uses GnuPG's gpgsm,
;; which features full-fledged certificate management, while openssl requires
;; major manual efforts for certificate revocation and expiry and has bugs
;; as documented under man smime(1).
-(ignore-errors (require 'epg))
+(require 'epg)
-(defcustom mml-smime-use (if (featurep 'epg) 'epg 'openssl)
+(defcustom mml-smime-use 'epg
"Whether to use OpenSSL or EasyPG (EPG) to handle S/MIME messages.
-Defaults to EPG if it's available.
-If you think about using OpenSSL, please read the BUGS section in the manual
-for the `smime' command coming with OpenSSL first. EasyPG is recommended."
+If you're thinking about using OpenSSL, please first read the BUGS section
+in the manual for the `smime' command that comes with OpenSSL.
+We recommend EasyPG."
:group 'mime-security
:type '(choice (const :tag "EPG" epg)
(const :tag "OpenSSL" openssl)))
(if (not (and (not (file-exists-p tmp))
(get-buffer tmp)))
(push tmp certfiles)
- (setq file (mm-make-temp-file (expand-file-name "mml."
- mm-tmp-directory)))
+ (setq file (make-temp-file (expand-file-name "mml." mm-tmp-directory)))
(with-current-buffer tmp
(write-region (point-min) (point-max) file))
(push file certfiles)
(list 'keyfile
(if (= (length smime-keys) 1)
(cadar smime-keys)
- (or (let ((from (cadr (funcall (if (boundp
- 'gnus-extract-address-components)
- gnus-extract-address-components
- 'mail-extract-address-components)
- (or (save-excursion
- (save-restriction
- (message-narrow-to-headers)
- (message-fetch-field "from")))
- "")))))
+ (or (let ((from (cadr (mail-extract-address-components
+ (or (save-excursion
+ (save-restriction
+ (message-narrow-to-headers)
+ (message-fetch-field "from")))
+ "")))))
(and from (smime-get-key-by-email from)))
(smime-get-key-by-email
(gnus-completing-read "Sign this part with what signature"
(while (not result)
(setq who (read-from-minibuffer
(format "%sLookup certificate for: " (or bad ""))
- (cadr (funcall (if (boundp
- 'gnus-extract-address-components)
- gnus-extract-address-components
- 'mail-extract-address-components)
- (or (save-excursion
- (save-restriction
- (message-narrow-to-headers)
- (message-fetch-field "to")))
- "")))))
+ (cadr (mail-extract-address-components
+ (or (save-excursion
+ (save-restriction
+ (message-narrow-to-headers)
+ (message-fetch-field "to")))
+ "")))))
(if (setq cert (smime-cert-by-dns who))
(setq result (list 'certfile (buffer-name cert)))
- (setq bad (gnus-format-message "`%s' not found. " who))))
+ (setq bad (format-message "`%s' not found. " who))))
(quit))
result))
"")))))
(if (setq cert (smime-cert-by-ldap who))
(setq result (list 'certfile (buffer-name cert)))
- (setq bad (gnus-format-message "`%s' not found. " who))))
+ (setq bad (format-message "`%s' not found. " who))))
(quit))
result))
(autoload 'mml-compute-boundary "mml")
- ;; We require mm-decode, which requires mm-bodies, which autoloads
- ;; message-options-get (!).
- (declare-function message-options-set "message" (symbol value))
-
(defun mml-smime-epg-sign (cont)
(let ((inhibit-redisplay t)
(boundary (mml-compute-boundary cont)))
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-info "Corrupted")
(throw 'error handle))
- (setq part (mm-replace-in-string part "\n" "\r\n")
+ (setq part (replace-regexp-in-string "\n" "\r\n" part)
context (epg-make-context 'CMS))
(condition-case error
(setq plain (epg-verify-string context (mm-get-part signature) part))
;;; Code:
- (eval-and-compile
- (if (locate-library "password-cache")
- (require 'password-cache)
- (require 'password)))
-
(eval-when-compile
(require 'cl)
(require 'mm-util))
(pop-to-buffer pgg-errors-buffer)
(error "Encrypt error"))
(delete-region (point-min) (point-max))
- (mm-with-unibyte-current-buffer
- (insert-buffer-substring pgg-output-buffer)
- (goto-char (point-min))
- (while (re-search-forward "\r+$" nil t)
- (replace-match "" t t))
- (when cte
- (mm-encode-content-transfer-encoding cte))
- (goto-char (point-min))
- (when headers
- (insert headers))
- (insert "\n"))
+ (insert
+ (with-temp-buffer
+ (set-buffer-multibyte nil)
+ (insert-buffer-substring pgg-output-buffer)
+ (goto-char (point-min))
+ (while (re-search-forward "\r+$" nil t)
+ (replace-match "" t t))
+ (when cte
+ (mm-encode-content-transfer-encoding cte))
+ (goto-char (point-min))
+ (when headers
+ (insert headers))
+ (insert "\n")
+ (buffer-string)))
t))
(defun mml1991-pgg-encrypt (cont &optional sign)
(let* ((pair (mml-secure-epg-sign 'OpenPGP 'clear))
(signature (car pair)))
(delete-region (point-min) (point-max))
- (mm-with-unibyte-current-buffer
- (insert signature)
- (goto-char (point-min))
- (while (re-search-forward "\r+$" nil t)
- (replace-match "" t t))
- (when cte
- (mm-encode-content-transfer-encoding cte))
- (goto-char (point-min))
- (when headers
- (insert headers))
- (insert "\n"))
+ (insert
+ (with-temp-buffer
+ (set-buffer-multibyte nil)
+ (insert signature)
+ (goto-char (point-min))
+ (while (re-search-forward "\r+$" nil t)
+ (replace-match "" t t))
+ (when cte
+ (mm-encode-content-transfer-encoding cte))
+ (goto-char (point-min))
+ (when headers
+ (insert headers))
+ (insert "\n")
+ (buffer-string)))
t)))
(defun mml1991-epg-encrypt (cont &optional sign)
;;; Code:
- (eval-and-compile
- (if (locate-library "password-cache")
- (require 'password-cache)
- (require 'password)))
-
(eval-when-compile (require 'cl))
(require 'mm-decode)
(require 'mm-util)
(require 'mml)
(require 'mml-sec)
+(require 'epg-config)
(defvar mc-pgp-always-sign)
;; Maybe this should be in eg mml-sec.el (and have a different name).
;; Then mml1991 would not need to require mml2015, and mml1991-use
;; could be removed.
-(defvar mml2015-use (or
- (progn
- (ignore-errors (require 'epg-config))
- (and (fboundp 'epg-check-configuration)
- 'epg))
- (progn
- (let ((abs-file (locate-library "pgg")))
- ;; Don't load PGG if it is marked as obsolete
- ;; (Emacs 24).
- (when (and abs-file
- (not (string-match "/obsolete/[^/]*\\'"
- abs-file)))
- (ignore-errors (require 'pgg))
- (and (fboundp 'pgg-sign-region)
- 'pgg))))
- (progn (ignore-errors
- (load "mc-toplev"))
- (and (fboundp 'mc-encrypt-generic)
- (fboundp 'mc-sign-generic)
- (fboundp 'mc-cleanup-recipient-headers)
- 'mailcrypt)))
+(defvar mml2015-use 'epg
"The package used for PGP/MIME.
Valid packages include `epg', `pgg' and `mailcrypt'.")
(or (y-or-n-p "Sign the message? ")
'not))))
'never)))
- (mm-with-unibyte-current-buffer
- (mc-encrypt-generic
- (or (message-options-get 'message-recipients)
- (message-options-set 'message-recipients
- (mc-cleanup-recipient-headers
- (read-string "Recipients: "))))
- nil nil nil
- (message-options-get 'message-sender))))
+ (insert
+ (with-temp-buffer
+ (set-buffer-multibyte nil)
+ (mc-encrypt-generic
+ (or (message-options-get 'message-recipients)
+ (message-options-set 'message-recipients
+ (mc-cleanup-recipient-headers
+ (read-string "Recipients: "))))
+ nil nil nil
+ (message-options-get 'message-sender))
+ (buffer-string))))
(goto-char (point-min))
(unless (looking-at "-----BEGIN PGP MESSAGE-----")
(error "Fail to encrypt the message"))
(insert "\r"))
(forward-line)
(end-of-line))
- (with-temp-file (setq signature-file (mm-make-temp-file "pgg"))
+ (with-temp-file (setq signature-file (make-temp-file "pgg"))
(mm-insert-part signature))
(if (condition-case err
(prog1
(if (condition-case err
(prog1
(mm-with-unibyte-buffer
- (insert (mm-encode-coding-string text coding-system))
+ (insert (encode-coding-string text coding-system))
(pgg-verify-region (point-min) (point-max) nil t))
(goto-char (point-min))
(while (search-forward "\r\n" nil t)
(autoload 'epg-expand-group "epg-config")
(autoload 'epa-select-keys "epa")
-(autoload 'gnus-create-image "gnus-ems")
-
(defun mml2015-epg-key-image (key-id)
"Return the image of a key, if any"
(with-temp-buffer
- (mm-set-buffer-multibyte nil)
+ (set-buffer-multibyte nil)
(let* ((coding-system-for-write 'binary)
(coding-system-for-read 'binary)
(data (shell-command-to-string
(mm-set-handle-multipart-parameter
mm-security-handle 'gnus-info "Corrupted")
(throw 'error handle))
- (setq part (mm-replace-in-string part "\n" "\r\n")
+ (setq part (replace-regexp-in-string "\n" "\r\n" part)
signature (mm-get-part signature)
context (epg-make-context))
(condition-case error
(defun mml2015-epg-clear-verify ()
(let ((inhibit-redisplay t)
(context (epg-make-context))
- (signature (mm-encode-coding-string (buffer-string)
- coding-system-for-write))
+ (signature (encode-coding-string (buffer-string)
+ coding-system-for-write))
plain)
(condition-case error
(setq plain (epg-verify-string context signature))
(mml2015-epg-verify-result-to-string
(epg-context-result-for context 'verify)))
(delete-region (point-min) (point-max))
- (insert (mm-decode-coding-string plain coding-system-for-read)))
+ (insert (decode-coding-string plain coding-system-for-read)))
(mml2015-extract-cleartext-signature))))
(defun mml2015-epg-sign (cont)
(map-charset-chars #'modify-category-entry (car charsets) ?b)
(setq charsets (cdr charsets))))
(modify-category-entry '(#x600 . #x6ff) ?b)
+ (modify-category-entry '(#x8a0 . #x8ff) ?b)
(modify-category-entry '(#xfb50 . #xfdff) ?b)
(modify-category-entry '(#xfe70 . #xfefe) ?b)
(set-case-syntax-pair ?Ɜ ?ɜ tbl)
(set-case-syntax-pair ?Ɡ ?ɡ tbl)
(set-case-syntax-pair ?Ɬ ?ɬ tbl)
+ (set-case-syntax-pair ?Ɪ ?ɪ tbl)
(set-case-syntax-pair ?Ʞ ?ʞ tbl)
(set-case-syntax-pair ?Ʇ ?ʇ tbl)
(set-case-syntax-pair ?Ʝ ?ʝ tbl)
(set-case-syntax-pair c (+ c #x1C60) tbl)
(setq c (1+ c)))
+ ;; Cyrillic Extended-C
+ (modify-category-entry '(#x1C80 . #x1C8F) ?y)
+
;; general punctuation
(setq c #x2000)
(while (<= c #x200b)
(set-case-syntax-pair c (+ c 28) tbl)
(setq c (1+ c)))
+ ;; Osage
+ (setq c #x104B0)
+ (while (<= c #x104D3)
+ (set-case-syntax-pair c (+ c 40) tbl)
+ (setq c (1+ c)))
+
;; Old Hungarian
(setq c #x10c80)
(while (<= c #x10cb2)
(set-case-syntax-pair c (+ c #x20) tbl)
(setq c (1+ c)))
+ ;; Adlam
+ (setq c #x1e900)
+ (while (<= c #x1e921)
+ (set-case-syntax-pair c (+ c #x22) tbl)
+ (setq c (1+ c)))
+
;; Combining diacritics
(modify-category-entry '(#x300 . #x362) ?^)
;; Combining marks
;; 2: East Asian Wide and Full-width characters.
(let ((l '((#x1100 . #x115F)
+ (#x231A . #x231B)
(#x2329 . #x232A)
+ (#x23E9 . #x23EC)
+ (#x23F0 . #x23F0)
+ (#x23F3 . #x23F3)
+ (#x25FD . #x25FE)
+ (#x2614 . #x2615)
+ (#x2648 . #x2653)
+ (#x267F . #x267F)
+ (#x2693 . #x2693)
+ (#x26A1 . #x26A1)
+ (#x26AA . #x26AB)
+ (#x26BD . #x26BE)
+ (#x26C4 . #x26C5)
+ (#x26CE . #x26CE)
+ (#x26D4 . #x26D4)
+ (#x26EA . #x26EA)
+ (#x26F2 . #x26F3)
+ (#x26F5 . #x26F5)
+ (#x26FA . #x26FA)
+ (#x26FD . #x26FD)
+ (#x2705 . #x2705)
+ (#x270A . #x270B)
+ (#x2728 . #x2728)
+ (#x274C . #x274C)
+ (#x274E . #x274E)
+ (#x2753 . #x2755)
+ (#x2757 . #x2757)
+ (#x2795 . #x2797)
+ (#x27B0 . #x27B0)
+ (#x27BF . #x27BF)
+ (#x2B1B . #x2B1C)
+ (#x2B50 . #x2B50)
+ (#x2B55 . #x2B55)
(#x2E80 . #x303E)
(#x3040 . #xA4CF)
(#xAC00 . #xD7A3)
(#xFE30 . #xFE6F)
(#xFF01 . #xFF60)
(#xFFE0 . #xFFE6)
+ (#x16FE0 . #x16FE0)
+ (#x17000 . #x187EC)
+ (#x18800 . #x18AF2)
+ (#x1F18E . #x1F18E)
+ (#x1F191 . #x1F19A)
+ (#x1F200 . #x1F202)
+ (#x1F210 . #x1F23B)
+ (#x1F300 . #x1F320)
+ (#x1F32D . #x1F335)
+ (#x1F337 . #x1F37C)
+ (#x1F37E . #x1F393)
+ (#x1F3A0 . #x1F3CA)
+ (#x1F3CF . #x1F3D3)
+ (#x1F3E0 . #x1F3F0)
+ (#x1F3F4 . #x1F3F4)
+ (#x1F3F8 . #x1F3FA)
+ (#x1F3FB . #x1F3FF)
+ (#x1F440 . #x1F440)
+ (#x1F442 . #x1F4FC)
+ (#x1F4FF . #x1F53D)
+ (#x1F54B . #x1F54E)
+ (#x1F550 . #x1F567)
+ (#x1F57A . #x1F57A)
+ (#x1F595 . #x1F596)
+ (#x1F5A4 . #x1F5A4)
+ (#x1F5FB . #x1F5FF)
+ (#x1F600 . #x1F64F)
+ (#x1F680 . #x1F6C5)
+ (#x1F6CC . #x1F6CC)
+ (#x1F6D0 . #x1F6D2)
+ (#x1F6EB . #x1F6EC)
+ (#x1F6F4 . #x1F6F6)
+ (#x1F910 . #x1F91E)
+ (#x1F920 . #x1F927)
+ (#x1F930 . #x1F930)
+ (#x1F933 . #x1F93E)
+ (#x1F940 . #x1F94B)
+ (#x1F950 . #x1F95E)
+ (#x1F980 . #x1F991)
+ (#x1F9C0 . #x1F9C0)
(#x20000 . #x2FFFF)
(#x30000 . #x3FFFF))))
(dolist (elt l)
(aset char-acronym-table i (car c0-acronyms))
(setq c0-acronyms (cdr c0-acronyms))))
-(let ((c1-acronyms '("XXX" "XXX" "BPH" "NBH" "IND" "NEL" "SSA" "ESA"
+(let ((c1-acronyms '("PAD" "HOP" "BPH" "NBH" "IND" "NEL" "SSA" "ESA"
"HTS" "HTJ" "VTS" "PLD" "PLU" "R1" "SS2" "SS1"
"DCS" "PU1" "PU2" "STS" "CCH" "MW" "SPA" "EPA"
- "SOS" "XXX" "SC1" "CSI" "ST" "OSC" "PM" "APC")))
+ "SOS" "SGCI" "SC1" "CSI" "ST" "OSC" "PM" "APC")))
(dotimes (i 32)
(aset char-acronym-table (+ #x0080 i) (car c1-acronyms))
(setq c1-acronyms (cdr c1-acronyms))))
("br" . "Latin-1") ; Breton
("bs" . "Latin-2") ; Bosnian
("byn" . "UTF-8") ; Bilin; Blin
- ("ca" . "Latin-1") ; Catalan
+ ("ca" "Catalan" iso-8859-1) ; Catalan
; co Corsican
("cs" "Czech" iso-8859-2)
("cy" "Welsh" iso-8859-14)
(#x14400 . #x14646)
;; (#x14647 . #x167FF) unused
(#x16800 . #x16F9F)
- ;; (#x16FA0 . #x1AFFF) unused
+ (#x16FE0 . #x16FE0)
+ ;; (#x17000 . #x187FF) Tangut Ideographs
+ ;; (#x18800 . #x18AFF) Tangut Components
+ ;; (#x18B00 . #x1AFFF) unused
(#x1B000 . #x1B0FF)
;; (#x1B100 . #x1BBFF) unused
(#x1BC00 . #x1BCAF)
;;; Code:
+ ;; This is used in xdisp.c to determine when bidi reordering is safe.
+ ;; (It starts non-nil in temacs, but we set it non-nil here anyway, in
+ ;; case someone loads loadup one more time.) We reset it after
+ ;; successfully loading charprop.el, which defines the Unicode tables
+ ;; bidi.c needs for its job.
+ (setq redisplay--inhibit-bidi t)
+
;; Add subdirectories to the load-path for files that might get
;; autoloaded when bootstrapping.
;; This is because PATH_DUMPLOADSEARCH is just "../lisp".
(let ((dir (car load-path)))
;; We'll probably overflow the pure space.
(setq purify-flag nil)
+ ;; Value of max-lisp-eval-depth when compiling initially.
+ ;; During bootstrapping the byte-compiler is run interpreted when
+ ;; compiling itself, which uses a lot more stack than usual.
+ (setq max-lisp-eval-depth 2200)
(setq load-path (list (expand-file-name "." dir)
(expand-file-name "emacs-lisp" dir)
(expand-file-name "language" dir)
(load "format")
(load "bindings")
(load "window") ; Needed here for `replace-buffer-in-windows'.
+ ;; We are now capable of resizing the mini-windows, so give the
+ ;; variable its advertised default value (it starts as nil, see
+ ;; xdisp.c).
+ (setq resize-mini-windows 'grow-only)
(setq load-source-file-function 'load-with-code-conversion)
(load "files")
(load "emacs-lisp/nadvice")
(load "emacs-lisp/cl-preloaded")
(load "minibuffer") ;After loaddefs, for define-minor-mode.
+(load "obarray") ;abbrev.el is implemented in terms of obarrays.
(load "abbrev") ;lisp-mode.el and simple.el use define-abbrev-table.
(load "simple")
(load "case-table")
;; This file doesn't exist when building a development version of Emacs
;; from the repository. It is generated just after temacs is built.
- (load "international/charprop.el" t)
+ (if (load "international/charprop.el" t)
+ (setq redisplay--inhibit-bidi nil))
(load "international/characters")
(load "composite")
(if (null (garbage-collect))
(setq pure-space-overflow t))
+ ;; Make sure we will attempt bidi reordering henceforth.
+ (setq redisplay--inhibit-bidi nil)
+
(if (member (car (last command-line-args)) '("dump" "bootstrap"))
(progn
(message "Dumping under the name emacs")
(eval-and-compile
(defmacro c--macroexpand-all (form &optional environment)
;; Macro to smooth out the renaming of `cl-macroexpand-all' in Emacs 24.3.
- (if (eq c--mapcan-status 'cl-mapcan)
+ (if (fboundp 'macroexpand-all)
`(macroexpand-all ,form ,environment)
`(cl-macroexpand-all ,form ,environment)))
wouldn't be able to undo them.
The return value is the value of the last form in BODY."
- `(let* ((modified (buffer-modified-p)) (buffer-undo-list t)
- (inhibit-read-only t) (inhibit-point-motion-hooks t)
- before-change-functions after-change-functions
- deactivate-mark
- buffer-file-name buffer-file-truename ; Prevent primitives checking
- ; for file modification
- ,@varlist)
- (unwind-protect
- (progn ,@body)
- (and (not modified)
- (buffer-modified-p)
- (set-buffer-modified-p nil)))))
-(put 'c-save-buffer-state 'lisp-indent-function 1)
+ (declare (debug t) (indent 1))
+ (if (fboundp 'with-silent-modifications)
+ `(with-silent-modifications (let* ,varlist ,@body))
+ `(let* ((modified (buffer-modified-p)) (buffer-undo-list t)
+ (inhibit-read-only t) (inhibit-point-motion-hooks t)
+ before-change-functions after-change-functions
+ deactivate-mark
+ buffer-file-name buffer-file-truename ; Prevent primitives checking
+ ; for file modification
+ ,@varlist)
+ (unwind-protect
+ (progn ,@body)
+ (and (not modified)
+ (buffer-modified-p)
+ (set-buffer-modified-p nil))))))
(defmacro c-tentative-buffer-changes (&rest body)
"Eval BODY and optionally restore the buffer contents to the state it
(def-edebug-spec c-clear-char-property t)
(def-edebug-spec c-clear-char-properties t)
(def-edebug-spec c-put-overlay t)
- (def-edebug-spec c-delete-overlay t) ;))
+ (def-edebug-spec c-delete-overlay t)
+ (def-edebug-spec c-self-bind-state-cache t);))
\f
;;; Functions.
(save-restriction
(widen)
(c-set-cpp-delimiters ,beg ,end)))))
+
+ (defmacro c-self-bind-state-cache (&rest forms)
+ ;; Bind the state cache to itself and execute the FORMS. It is assumed that no
+ ;; buffer changes will happen in FORMS, and no hidden buffer changes which could
+ ;; affect the parsing will be made by FORMS.
+ `(let ((c-state-cache (copy-tree c-state-cache))
+ (c-state-cache-good-pos c-state-cache-good-pos)
+ ;(c-state-nonlit-pos-cache (copy-tree c-state-nonlit-pos-cache))
+ ;(c-state-nonlit-pos-cache-limit c-state-nonlit-pos-cache-limit)
+ ;(c-state-semi-nonlit-pos-cache (copy-treec c-state-semi-nonlit-pos-cache))
+ ;(c-state-semi-nonlit-pos-cache-limit c-state-semi-nonlit-pos-cache)
+ (c-state-brace-pair-desert (copy-tree c-state-brace-pair-desert))
+ (c-state-point-min c-state-point-min)
+ (c-state-point-min-lit-type c-state-point-min-lit-type)
+ (c-state-point-min-lit-start c-state-point-min-lit-start)
+ (c-state-min-scan-pos c-state-min-scan-pos)
+ (c-state-old-cpp-beg c-state-old-cpp-beg)
+ (c-state-old-cpp-end c-state-old-cpp-end))
+ ,@forms))
+
\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; The following macros are to be used only in `c-parse-state' and its
;; two newlines with horizontal whitespace between them.
;;
;; The reason to include the first following char is to cope with
-;; "rung positions" that doesn't have any ordinary whitespace. If
+;; "rung positions" that don't have any ordinary whitespace. If
;; `c-is-sws' is put on a token character it does not have
;; `c-in-sws' set simultaneously. That's the only case when that
;; can occur, and the reason for not extending the `c-in-sws'
;; if it's anything that can't start syntactic ws, so we can bail out
;; early in the majority of cases when there just are a few ws chars.
(skip-chars-forward " \t\n\r\f\v")
- (when (looking-at c-syntactic-ws-start)
+ (when (or (looking-at c-syntactic-ws-start)
+ (and c-opt-cpp-prefix
+ (looking-at c-noise-macro-name-re)))
(setq rung-end-pos (min (1+ (point)) (point-max)))
(if (setq rung-is-marked (text-property-any rung-pos rung-end-pos
(with-silent-modifications
(while
(progn
+ ;; In the following while form, we move over a "ladder" and
+ ;; following simple WS each time round the loop, appending the WS
+ ;; onto the ladder, joining adjacent ladders, and terminating when
+ ;; there is no more WS or we reach EOB.
(while
(when (and rung-is-marked
(get-text-property (point) 'c-in-sws))
(setq rung-pos (point)
last-put-in-sws-pos rung-pos)))
+ ;; Now move over any comments (x)or a CPP construct.
(setq simple-ws-end (point))
(c-forward-comments)
(forward-line 1)
(setq safe-start t)
;; Don't cache at eob in case the buffer is narrowed.
+ (not (eobp)))
+
+ ((and c-opt-cpp-prefix
+ (looking-at c-noise-macro-name-re))
+ ;; Skip over a noise macro.
+ (goto-char (match-end 1))
+ (setq safe-start t)
(not (eobp)))))
;; We've searched over a piece of non-white syntactic ws. See if this
(when (and (not (bobp))
(save-excursion
(backward-char)
- (looking-at c-syntactic-ws-end)))
-
+ (or (looking-at c-syntactic-ws-end)
+ (and c-opt-cpp-prefix
+ (looking-at c-symbol-char-key)
+ (progn (c-beginning-of-current-token)
+ (looking-at c-noise-macro-name-re))))))
;; Try to find a rung position in the simple ws preceding point, so that
;; we can get a cache hit even if the last bit of the simple ws has
;; changed recently.
(with-silent-modifications
(while
(progn
+ ;; Each time round the next while form, we move back over a ladder
+ ;; and append any simple WS preceding it, if possible joining with
+ ;; the previous ladder.
(while
(when (and rung-is-marked
(not (bobp))
;; narrowed out, and we can't risk marking the simple ws
;; at the end of it.
(goto-char next-rung-pos)
+ t)
+
+ ((and c-opt-cpp-prefix
+ (save-excursion
+ (and (< (skip-syntax-backward "w_") 0)
+ (progn (setq next-rung-pos (point))
+ (looking-at c-noise-macro-name-re)))))
+ ;; Skipped over a noise macro
+ (goto-char next-rung-pos)
t)))
;; We've searched over a piece of non-white syntactic ws. See if this
(setq safe-pos-list (cdr safe-pos-list)))
(unless (setq safe-pos (car-safe safe-pos-list))
(setq safe-pos (max (or (c-safe-position
- (point) (or c-state-cache
- (c-parse-state)))
+ (point) (c-parse-state))
0)
(point-min))
safe-pos-list (list safe-pos)))
Note that this function might do hidden buffer changes. See the
comment at the start of cc-engine.el for more info."
- (let ((start (point))
- state-2
- ;; A list of syntactically relevant positions in descending
- ;; order. It's used to avoid scanning repeatedly over
- ;; potentially large regions with `parse-partial-sexp' to verify
- ;; each position. Used in `c-ssb-lit-begin'
- safe-pos-list
- ;; The result from `c-beginning-of-macro' at the start position or the
- ;; start position itself if it isn't within a macro. Evaluated on
- ;; demand.
- start-macro-beg
- ;; The earliest position after the current one with the same paren
- ;; level. Used only when `paren-level' is set.
- lit-beg
- (paren-level-pos (point)))
-
- (while
- (progn
- ;; The next loop "tries" to find the end point each time round,
- ;; loops when it hasn't succeeded.
- (while
- (and
- (let ((pos (point)))
- (while (and
- (< (skip-chars-backward skip-chars limit) 0)
- ;; Don't stop inside a literal.
- (when (setq lit-beg (c-ssb-lit-begin))
- (goto-char lit-beg)
- t)))
- (< (point) pos))
-
- (let ((pos (point)) state-2 pps-end-pos)
-
- (cond
- ((and paren-level
- (save-excursion
- (setq state-2 (parse-partial-sexp
- pos paren-level-pos -1)
- pps-end-pos (point))
- (/= (car state-2) 0)))
- ;; Not at the right level.
-
- (if (and (< (car state-2) 0)
- ;; We stop above if we go out of a paren.
- ;; Now check whether it precedes or is
- ;; nested in the starting sexp.
- (save-excursion
- (setq state-2
- (parse-partial-sexp
- pps-end-pos paren-level-pos
- nil nil state-2))
- (< (car state-2) 0)))
-
- ;; We've stopped short of the starting position
- ;; so the hit was inside a nested list. Go up
- ;; until we are at the right level.
- (condition-case nil
- (progn
- (goto-char (scan-lists pos -1
- (- (car state-2))))
- (setq paren-level-pos (point))
- (if (and limit (>= limit paren-level-pos))
- (progn
- (goto-char limit)
- nil)
- t))
- (error
- (goto-char (or limit (point-min)))
- nil))
-
- ;; The hit was outside the list at the start
- ;; position. Go to the start of the list and exit.
- (goto-char (1+ (elt state-2 1)))
- nil))
-
- ((c-beginning-of-macro limit)
- ;; Inside a macro.
- (if (< (point)
- (or start-macro-beg
- (setq start-macro-beg
- (save-excursion
- (goto-char start)
- (c-beginning-of-macro limit)
- (point)))))
- t
-
- ;; It's inside the same macro we started in so it's
- ;; a relevant match.
- (goto-char pos)
- nil))))))
-
- (> (point)
- (progn
- ;; Skip syntactic ws afterwards so that we don't stop at the
- ;; end of a comment if `skip-chars' is something like "^/".
- (c-backward-syntactic-ws)
- (point)))))
+ (c-self-bind-state-cache
+ (let ((start (point))
+ state-2
+ ;; A list of syntactically relevant positions in descending
+ ;; order. It's used to avoid scanning repeatedly over
+ ;; potentially large regions with `parse-partial-sexp' to verify
+ ;; each position. Used in `c-ssb-lit-begin'
+ safe-pos-list
+ ;; The result from `c-beginning-of-macro' at the start position or the
+ ;; start position itself if it isn't within a macro. Evaluated on
+ ;; demand.
+ start-macro-beg
+ ;; The earliest position after the current one with the same paren
+ ;; level. Used only when `paren-level' is set.
+ lit-beg
+ (paren-level-pos (point)))
+
+ (while
+ (progn
+ ;; The next loop "tries" to find the end point each time round,
+ ;; loops when it hasn't succeeded.
+ (while
+ (and
+ (let ((pos (point)))
+ (while (and
+ (< (skip-chars-backward skip-chars limit) 0)
+ ;; Don't stop inside a literal.
+ (when (setq lit-beg (c-ssb-lit-begin))
+ (goto-char lit-beg)
+ t)))
+ (< (point) pos))
+
+ (let ((pos (point)) state-2 pps-end-pos)
+
+ (cond
+ ((and paren-level
+ (save-excursion
+ (setq state-2 (parse-partial-sexp
+ pos paren-level-pos -1)
+ pps-end-pos (point))
+ (/= (car state-2) 0)))
+ ;; Not at the right level.
+
+ (if (and (< (car state-2) 0)
+ ;; We stop above if we go out of a paren.
+ ;; Now check whether it precedes or is
+ ;; nested in the starting sexp.
+ (save-excursion
+ (setq state-2
+ (parse-partial-sexp
+ pps-end-pos paren-level-pos
+ nil nil state-2))
+ (< (car state-2) 0)))
+
+ ;; We've stopped short of the starting position
+ ;; so the hit was inside a nested list. Go up
+ ;; until we are at the right level.
+ (condition-case nil
+ (progn
+ (goto-char (scan-lists pos -1
+ (- (car state-2))))
+ (setq paren-level-pos (point))
+ (if (and limit (>= limit paren-level-pos))
+ (progn
+ (goto-char limit)
+ nil)
+ t))
+ (error
+ (goto-char (or limit (point-min)))
+ nil))
+
+ ;; The hit was outside the list at the start
+ ;; position. Go to the start of the list and exit.
+ (goto-char (1+ (elt state-2 1)))
+ nil))
+
+ ((c-beginning-of-macro limit)
+ ;; Inside a macro.
+ (if (< (point)
+ (or start-macro-beg
+ (setq start-macro-beg
+ (save-excursion
+ (goto-char start)
+ (c-beginning-of-macro limit)
+ (point)))))
+ t
+
+ ;; It's inside the same macro we started in so it's
+ ;; a relevant match.
+ (goto-char pos)
+ nil))))))
+
+ (> (point)
+ (progn
+ ;; Skip syntactic ws afterwards so that we don't stop at the
+ ;; end of a comment if `skip-chars' is something like "^/".
+ (c-backward-syntactic-ws)
+ (point)))))
- ;; We might want to extend this with more useful return values in
- ;; the future.
- (/= (point) start)))
+ ;; We might want to extend this with more useful return values in
+ ;; the future.
+ (/= (point) start))))
;; The following is an alternative implementation of
;; `c-syntactic-skip-backward' that uses backward movement to keep
`(c-forward-type)
`(c-forward-name)))
nil
- (and (looking-at c-keywords-regexp)
- (c-forward-keyword-clause 1))))
+ (cond ((looking-at c-keywords-regexp)
+ (c-forward-keyword-clause 1))
+ ((looking-at c-noise-macro-with-parens-name-re)
+ (c-forward-noise-clause)))))
(when (memq res '(t known found prefix))
,(when (eq type 'ref)
`(when c-record-type-identifiers
(c-forward-syntactic-ws)
(c-forward-keyword-prefixed-id ,type)))))
+(defun c-forward-noise-clause ()
+ ;; Point is at a c-noise-macro-with-parens-names macro identifier. Go
+ ;; forward over this name, any parenthesis expression which follows it, and
+ ;; any syntactic WS, ending up at the next token. If there is an unbalanced
+ ;; paren expression, leave point at it. Always Return t.
+ (c-forward-token-2)
+ (if (and (eq (char-after) ?\()
+ (c-go-list-forward))
+ (c-forward-syntactic-ws))
+ t)
+
(defun c-forward-keyword-clause (match)
;; Submatch MATCH in the current match data is assumed to surround a
;; token. If it's a keyword, move over it and any immediately
; "typedef".
(goto-char (match-end 1))
(c-forward-syntactic-ws)
+
+ (while (cond
+ ((looking-at c-decl-hangon-key)
+ (c-forward-keyword-clause 1))
+ ((looking-at c-noise-macro-with-parens-name-re)
+ (c-forward-noise-clause))))
+
(setq pos (point))
(setq name-res (c-forward-name))
;; of the while. These are, e.g. "*" in "int *foo" or "(" and
;; "*" in "int (*foo) (void)" (Note similar code in
;; `c-forward-decl-or-cast-1'.)
- (while (and (looking-at c-type-decl-prefix-key)
- (if (and (c-major-mode-is 'c++-mode)
- (match-beginning 3))
- ;; If the third submatch matches in C++ then
- ;; we're looking at an identifier that's a
- ;; prefix only if it specifies a member pointer.
- (progn
- (setq id-start (point))
- (c-forward-name)
- (if (looking-at "\\(::\\)")
- ;; We only check for a trailing "::" and
- ;; let the "*" that should follow be
- ;; matched in the next round.
- t
- ;; It turned out to be the real identifier,
- ;; so flag that and stop.
- (setq got-identifier t)
- nil))
- t))
- (if (eq (char-after) ?\()
- (progn
- (setq paren-depth (1+ paren-depth))
- (forward-char))
- (goto-char (match-end 1)))
- (c-forward-syntactic-ws))
+ (while
+ (cond
+ ((looking-at c-decl-hangon-key)
+ (c-forward-keyword-clause 1))
+ ((looking-at c-noise-macro-with-parens-name-re)
+ (c-forward-noise-clause))
+ ((and (looking-at c-type-decl-prefix-key)
+ (if (and (c-major-mode-is 'c++-mode)
+ (match-beginning 3))
+ ;; If the third submatch matches in C++ then
+ ;; we're looking at an identifier that's a
+ ;; prefix only if it specifies a member pointer.
+ (progn
+ (setq id-start (point))
+ (c-forward-name)
+ (if (looking-at "\\(::\\)")
+ ;; We only check for a trailing "::" and
+ ;; let the "*" that should follow be
+ ;; matched in the next round.
+ t
+ ;; It turned out to be the real identifier,
+ ;; so flag that and stop.
+ (setq got-identifier t)
+ nil))
+ t))
+ (if (eq (char-after) ?\()
+ (progn
+ (setq paren-depth (1+ paren-depth))
+ (forward-char))
+ (goto-char (match-end 1)))
+ (c-forward-syntactic-ws)
+ t)))
;; If we haven't passed the identifier already, do it now.
(unless got-identifier
;; Skip over any trailing bit, such as "__attribute__".
(progn
- (when (looking-at c-decl-hangon-key)
- (c-forward-keyword-clause 1))
- (<= (point) limit))
+ (while (cond
+ ((looking-at c-decl-hangon-key)
+ (c-forward-keyword-clause 1))
+ ((looking-at c-noise-macro-with-parens-name-re)
+ (c-forward-noise-clause))))
+ (<= (point) limit))
;; Search syntactically to the end of the declarator (";",
;; ",", a closing paren, eob etc) or to the beginning of an
;; macros like __INLINE__, so we recognize both types and known
;; specifiers after them too.
(while
- (let* ((start (point)) kwd-sym kwd-clause-end found-type)
+ (let* ((start (point)) kwd-sym kwd-clause-end found-type noise-start)
+ (cond
;; Look for a specifier keyword clause.
- (when (or (looking-at c-prefix-spec-kwds-re) ;FIXME!!! includes auto
- (and (c-major-mode-is 'java-mode)
- (looking-at "@[A-Za-z0-9]+")))
- (if (save-match-data (looking-at c-typedef-key))
- (setq at-typedef t))
+ ((or (looking-at c-prefix-spec-kwds-re)
+ (and (c-major-mode-is 'java-mode)
+ (looking-at "@[A-Za-z0-9]+")))
+ (save-match-data
+ (if (looking-at c-typedef-key)
+ (setq at-typedef t)))
(setq kwd-sym (c-keyword-sym (match-string 1)))
(save-excursion
(c-forward-keyword-clause 1)
(setq kwd-clause-end (point))))
+ ((looking-at c-noise-macro-with-parens-name-re)
+ (setq noise-start (point))
+ (c-forward-noise-clause)
+ (setq kwd-clause-end (point))))
(when (setq found-type (c-forward-type t)) ; brace-block-too
;; Found a known or possible type or a prefix of a known type.
backup-at-type-decl nil
backup-maybe-typeless nil))
- (if kwd-sym
+ (if (or kwd-sym noise-start)
(progn
;; Handle known specifier keywords and
;; `c-decl-hangon-kwds' which can occur after known
;; types.
- (if (c-keyword-member kwd-sym 'c-decl-hangon-kwds)
- ;; It's a hang-on keyword that can occur anywhere.
+ (if (or (c-keyword-member kwd-sym 'c-decl-hangon-kwds)
+ noise-start)
+ ;; It's a hang-on keyword or noise clause that can occur
+ ;; anywhere.
(progn
- (setq at-decl-or-cast t)
(if at-type
;; Move the identifier start position if
;; we've passed a type.
;; If a known type was found, we still need to skip over any
;; hangon keyword clauses after it. Otherwise it has already
;; been done in the loop above.
- (while (looking-at c-decl-hangon-key)
- (c-forward-keyword-clause 1))
+ (while
+ (cond ((looking-at c-decl-hangon-key)
+ (c-forward-keyword-clause 1))
+ ((looking-at c-noise-macro-with-parens-name-re)
+ (c-forward-noise-clause))))
(setq id-start (point)))
((eq at-type 'prefix)
t)
((looking-at c-after-brace-list-key) t)
((looking-at c-brace-list-key) nil)
+ ((eq (char-after) ?\()
+ (and (eq (c-backward-token-2) 0)
+ (or (looking-at c-decl-hangon-key)
+ (looking-at c-noise-macro-with-parens-name-re))))
+
((and c-recognize-<>-arglists
(eq (char-after) ?<)
(looking-at "\\s("))
;; CASE 5A.3: brace list open
((save-excursion
(c-beginning-of-decl-1 lim)
- (while (looking-at c-specifier-key)
- (goto-char (match-end 1))
- (c-forward-syntactic-ws indent-point))
+ (while (cond
+ ((looking-at c-specifier-key)
+ (c-forward-keyword-clause 1))
+ ((looking-at c-noise-macro-with-parens-name-re)
+ (c-forward-noise-clause))))
(setq placeholder (c-point 'boi))
(or (consp special-brace-list)
(and (or (save-excursion
(t
(save-excursion
(c-beginning-of-decl-1 lim)
- (while (looking-at c-specifier-key)
- (goto-char (match-end 1))
- (c-forward-syntactic-ws indent-point))
+ (while (cond
+ ((looking-at c-specifier-key)
+ (c-forward-keyword-clause 1))
+ ((looking-at c-noise-macro-with-parens-name-re)
+ (c-forward-noise-clause))))
(c-add-syntax 'defun-open (c-point 'boi))
;; Bogus to use bol here, but it's the legacy. (Resolved,
;; 2007-11-09)
(c-beginning-of-statement-1
(c-safe-position (1- containing-sexp) paren-state))
(c-forward-token-2 0)
- (while (looking-at c-specifier-key)
- (goto-char (match-end 1))
- (c-forward-syntactic-ws))
+ (while (cond
+ ((looking-at c-specifier-key)
+ (c-forward-keyword-clause 1))
+ ((looking-at c-noise-macro-with-parens-name-re)
+ (c-forward-noise-clause))))
(c-add-syntax 'brace-list-open (c-point 'boi))))
;; CASE 9B: brace-list-close brace
;; Font-locking support.
(defun elisp--font-lock-flush-elisp-buffers (&optional file)
- ;; FIXME: Aren't we only ever called from after-load-functions?
- ;; Don't flush during load unless called from after-load-functions.
- ;; In that case, FILE is non-nil. It's somehow strange that
- ;; load-in-progress is t when an after-load-function is called since
- ;; that should run *after* the load...
+ ;; We're only ever called from after-load-functions, load-in-progress can
+ ;; still be t in case of nested loads.
(when (or (not load-in-progress) file)
;; FIXME: If the loaded file did not define any macros, there shouldn't
;; be any need to font-lock-flush all the Elisp buffers.
" " (cadr table-etc)))
(cddr table-etc)))))))))
- (defun lisp-completion-at-point (_predicate)
+ (defun lisp-completion-at-point (&optional _predicate)
(declare (obsolete elisp-completion-at-point "25.1"))
(elisp-completion-at-point))
error ("Specified time is not representable");
}
- static void
+ static _Noreturn void
invalid_time (void)
{
error ("Invalid time specification");
Lisp_Object high, low, usec, psec;
struct lisp_time t;
int len = disassemble_lisp_time (specified_time, &high, &low, &usec, &psec);
- int val = len ? decode_time_components (high, low, usec, psec, &t, 0) : 0;
+ if (!len)
+ invalid_time ();
+ int val = decode_time_components (high, low, usec, psec, &t, 0);
check_time_validity (val);
*plen = len;
return t;
start2_addr = BYTE_POS_ADDR (start2_byte);
memcpy (temp, start1_addr, len1_byte);
memcpy (start1_addr, start2_addr, len2_byte);
- memcpy (start1_addr + len2_byte, start1_addr + len1_byte, len_mid);
+ memmove (start1_addr + len2_byte, start1_addr + len1_byte, len_mid);
memcpy (start1_addr + len2_byte + len_mid, temp, len1_byte);
SAFE_FREE ();
struct image_cache *c = FRAME_IMAGE_CACHE (f);
ptrdiff_t i;
+ if (!c)
+ c = FRAME_IMAGE_CACHE (f) = make_image_cache ();
+
/* Find a free slot in c->images. */
for (i = 0; i < c->used; ++i)
if (c->images[i] == NULL)
{
Lisp_Object value;
int desired_width, desired_height;
+ double scale = 1;
+
+ value = image_spec_value (spec, QCscale, NULL);
+ if (NUMBERP (value))
+ scale = extract_float (value);
/* If width and/or height is set in the display spec assume we want
to scale to those values. If either h or w is unspecified, the
unspecified should be calculated from the specified to preserve
aspect ratio. */
value = image_spec_value (spec, QCwidth, NULL);
- desired_width = NATNUMP (value) ? min (XFASTINT (value), INT_MAX) : -1;
+ desired_width = NATNUMP (value) ?
+ min (XFASTINT (value) * scale, INT_MAX) : -1;
value = image_spec_value (spec, QCheight, NULL);
- desired_height = NATNUMP (value) ? min (XFASTINT (value), INT_MAX) : -1;
+ desired_height = NATNUMP (value) ?
+ min (XFASTINT (value) * scale, INT_MAX) : -1;
+
+ width = width * scale;
+ height = height * scale;
if (desired_width == -1)
{
/* h known, calculate w. */
desired_width = scale_image_size (desired_height, height, width);
+ /* We have no width/height settings, so just apply the scale. */
+ if (desired_width == -1 && desired_height == -1)
+ {
+ desired_width = width;
+ desired_height = height;
+ }
+
*d_width = desired_width;
*d_height = desired_height;
}
return 0;
}
+#ifdef HAVE_MAGICKAUTOORIENTIMAGE
+ /* If no :rotation is explicitly specified, apply the automatic
+ rotation from EXIF. */
+ if (NILP (image_spec_value (img->spec, QCrotation, NULL)))
+ if (MagickAutoOrientImage (image_wand) == MagickFalse)
+ {
+ image_error ("Error applying automatic orientation in image `%s'", img->spec);
+ DestroyMagickWand (image_wand);
+ return 0;
+ }
+#endif
+
if (ino < 0 || ino >= MagickGetNumberImages (image_wand))
{
image_error ("Invalid image number `%s' in image `%s'", image, img->spec);
eassert (gdk_pixbuf_get_has_alpha (pixbuf));
eassert (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8);
-#ifdef USE_CAIRO
{
+#ifdef USE_CAIRO
unsigned char *data = (unsigned char *) xmalloc (width*height*4);
uint32_t bgcolor = get_spec_bg_or_alpha_as_argb (img, f);
create_cairo_image_surface (img, data, width, height);
g_object_unref (pixbuf);
- }
#else
- /* Try to create a x pixmap to hold the svg pixmap. */
- XImagePtr ximg;
- if (!image_create_x_image_and_pixmap (f, img, width, height, 0, &ximg, 0))
- {
- g_object_unref (pixbuf);
- return 0;
- }
+ /* Try to create a x pixmap to hold the svg pixmap. */
+ XImagePtr ximg;
+ if (!image_create_x_image_and_pixmap (f, img, width, height, 0, &ximg, 0))
+ {
+ g_object_unref (pixbuf);
+ return 0;
+ }
- init_color_table ();
+ init_color_table ();
- /* Handle alpha channel by combining the image with a background
- color. */
- XColor background;
- Lisp_Object specified_bg = image_spec_value (img->spec, QCbackground, NULL);
- if (!STRINGP (specified_bg)
- || !x_defined_color (f, SSDATA (specified_bg), &background, 0))
- x_query_frame_background_color (f, &background);
-
- /* SVG pixmaps specify transparency in the last byte, so right
- shift 8 bits to get rid of it, since emacs doesn't support
- transparency. */
- background.red >>= 8;
- background.green >>= 8;
- background.blue >>= 8;
-
- /* This loop handles opacity values, since Emacs assumes
- non-transparent images. Each pixel must be "flattened" by
- calculating the resulting color, given the transparency of the
- pixel, and the image background color. */
- for (int y = 0; y < height; ++y)
- {
- for (int x = 0; x < width; ++x)
- {
- int red;
- int green;
- int blue;
- int opacity;
-
- red = *pixels++;
- green = *pixels++;
- blue = *pixels++;
- opacity = *pixels++;
-
- red = ((red * opacity)
- + (background.red * ((1 << 8) - opacity)));
- green = ((green * opacity)
- + (background.green * ((1 << 8) - opacity)));
- blue = ((blue * opacity)
- + (background.blue * ((1 << 8) - opacity)));
-
- XPutPixel (ximg, x, y, lookup_rgb_color (f, red, green, blue));
- }
+ /* Handle alpha channel by combining the image with a background
+ color. */
+ XColor background;
+ Lisp_Object specified_bg = image_spec_value (img->spec, QCbackground, NULL);
+ if (!STRINGP (specified_bg)
+ || !x_defined_color (f, SSDATA (specified_bg), &background, 0))
+ x_query_frame_background_color (f, &background);
+
+ /* SVG pixmaps specify transparency in the last byte, so right
+ shift 8 bits to get rid of it, since emacs doesn't support
+ transparency. */
+ background.red >>= 8;
+ background.green >>= 8;
+ background.blue >>= 8;
+
+ /* This loop handles opacity values, since Emacs assumes
+ non-transparent images. Each pixel must be "flattened" by
+ calculating the resulting color, given the transparency of the
+ pixel, and the image background color. */
+ for (int y = 0; y < height; ++y)
+ {
+ for (int x = 0; x < width; ++x)
+ {
+ int red = *pixels++;
+ int green = *pixels++;
+ int blue = *pixels++;
+ int opacity = *pixels++;
+
+ red = ((red * opacity)
+ + (background.red * ((1 << 8) - opacity)));
+ green = ((green * opacity)
+ + (background.green * ((1 << 8) - opacity)));
+ blue = ((blue * opacity)
+ + (background.blue * ((1 << 8) - opacity)));
+
+ XPutPixel (ximg, x, y, lookup_rgb_color (f, red, green, blue));
+ }
- pixels += rowstride - 4 * width;
- }
+ pixels += rowstride - 4 * width;
+ }
#ifdef COLOR_TABLE_SUPPORT
- /* Remember colors allocated for this image. */
- img->colors = colors_in_color_table (&img->ncolors);
- free_color_table ();
+ /* Remember colors allocated for this image. */
+ img->colors = colors_in_color_table (&img->ncolors);
+ free_color_table ();
#endif /* COLOR_TABLE_SUPPORT */
- g_object_unref (pixbuf);
+ g_object_unref (pixbuf);
- img->width = width;
- img->height = height;
+ img->width = width;
+ img->height = height;
- /* Maybe fill in the background field while we have ximg handy.
- Casting avoids a GCC warning. */
- IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg);
+ /* Maybe fill in the background field while we have ximg handy.
+ Casting avoids a GCC warning. */
+ IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg);
- /* Put ximg into the image. */
- image_put_x_image (f, img, ximg, 0);
+ /* Put ximg into the image. */
+ image_put_x_image (f, img, ximg, 0);
#endif /* ! USE_CAIRO */
+ }
return 1;
DEFSYM (QCcrop, ":crop");
DEFSYM (QCrotation, ":rotation");
DEFSYM (QCmatrix, ":matrix");
+ DEFSYM (QCscale, ":scale");
DEFSYM (QCcolor_adjustment, ":color-adjustment");
DEFSYM (QCmask, ":mask");
static bool
echo_keystrokes_p (void)
{
- return (!cursor_in_echo_area)
- && (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0
- : INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0
- : false);
+ return (FLOATP (Vecho_keystrokes) ? XFLOAT_DATA (Vecho_keystrokes) > 0.0
+ : INTEGERP (Vecho_keystrokes) ? XINT (Vecho_keystrokes) > 0
+ : false);
}
/* Add C to the echo string, without echoing it immediately. C can be
}
#endif
-
#if defined HAVE_INOTIFY || defined HAVE_KQUEUE || defined HAVE_GFILENOTIFY
case FILE_NOTIFY_EVENT:
{
if (!echo_keystrokes_p ())
current_kboard->immediate_echo = false;
}
- else if (echo_keystrokes_p ())
+ else if (cursor_in_echo_area /* FIXME: Not sure why we test this here,
+ maybe we should just drop this test. */
+ && echo_keystrokes_p ())
/* This doesn't put in a dash if the echo buffer is empty, so
you don't always see a dash hanging out in the minibuffer. */
echo_dash ();
is used. Note that [Enter] is not echoed by dos. */
cursor_to (SELECTED_FRAME (), 0, 0);
#endif
+
+ write_stdout ("Emacs is resuming after an emergency escape.\n");
+
/* It doesn't work to autosave while GC is in progress;
the code used for auto-saving doesn't cope with the mark bit. */
if (!gc_in_progress)
variable are `sigusr1' and `sigusr2'. */);
Vdebug_on_event = intern_c_string ("sigusr2");
+ DEFVAR_BOOL ("attempt-stack-overflow-recovery",
+ attempt_stack_overflow_recovery,
+ doc: /* If non-nil, attempt to recover from C stack
+overflow. This recovery is unsafe and may lead to deadlocks or data
+corruption, but it usually works and may preserve modified buffers
+that would otherwise be lost. If nil, treat stack overflow like any
+other kind of crash. */);
+ attempt_stack_overflow_recovery = true;
+
+ DEFVAR_BOOL ("attempt-orderly-shutdown-on-fatal-signal",
+ attempt_orderly_shutdown_on_fatal_signal,
+ doc: /* If non-nil, attempt to perform an orderly
+shutdown when Emacs receives a fatal signal (e.g., a crash).
+This cleanup is unsafe and may lead to deadlocks or data corruption,
+but it usually works and may preserve modified buffers that would
+otherwise be lost. If nil, crash immediately in response to fatal
+signals. */);
+ attempt_orderly_shutdown_on_fatal_signal = true;
+
/* Create the initial keyboard. Qt means 'unset'. */
initial_kboard = allocate_kboard (Qt);
}
character properties needed for reordering are not yet
available. */
it->bidi_p =
- NILP (Vpurify_flag)
+ !redisplay__inhibit_bidi
&& !NILP (BVAR (current_buffer, bidi_display_reordering))
&& it->multibyte_p;
loading loadup.el, as the necessary character property tables are
not yet available. */
it->bidi_p =
- NILP (Vpurify_flag)
+ !redisplay__inhibit_bidi
&& !NILP (BVAR (&buffer_defaults, bidi_display_reordering));
if (s == NULL)
The optional argument FROM, if non-nil, specifies the first text
position and defaults to the minimum accessible position of the buffer.
-If FROM is t, use the minimum accessible position that is not a newline
-character. TO, if non-nil, specifies the last text position and
+If FROM is t, use the minimum accessible position that starts a
+non-empty line. TO, if non-nil, specifies the last text position and
defaults to the maximum accessible position of the buffer. If TO is t,
-use the maximum accessible position that is not a newline character.
+use the maximum accessible position that ends a non-empty line.
The optional argument X-LIMIT, if non-nil, specifies the maximum text
width that can be returned. X-LIMIT nil or omitted, means to use the
-pixel-width of WINDOW's body; use this if you do not intend to change
-the width of WINDOW. Use the maximum width WINDOW may assume if you
-intend to change WINDOW's width. In any case, text whose x-coordinate
-is beyond X-LIMIT is ignored. Since calculating the width of long lines
-can take some time, it's always a good idea to make this argument as
-small as possible; in particular, if the buffer contains long lines that
-shall be truncated anyway.
+pixel-width of WINDOW's body; use this if you want to know how high
+WINDOW should be become in order to fit all of its buffer's text with
+the width of WINDOW unaltered. Use the maximum width WINDOW may assume
+if you intend to change WINDOW's width. In any case, text whose
+x-coordinate is beyond X-LIMIT is ignored. Since calculating the width
+of long lines can take some time, it's always a good idea to make this
+argument as small as possible; in particular, if the buffer contains
+long lines that shall be truncated anyway.
The optional argument Y-LIMIT, if non-nil, specifies the maximum text
-height that can be returned. Text lines whose y-coordinate is beyond
-Y-LIMIT are ignored. Since calculating the text height of a large
-buffer can take some time, it makes sense to specify this argument if
-the size of the buffer is unknown.
+height (exluding the height of the mode- or header-line, if any) that
+can be returned. Text lines whose y-coordinate is beyond Y-LIMIT are
+ignored. Since calculating the text height of a large buffer can take
+some time, it makes sense to specify this argument if the size of the
+buffer is large or unknown.
Optional argument MODE-AND-HEADER-LINE nil or omitted means do not
include the height of the mode- or header-line of WINDOW in the return
ptrdiff_t start, end, pos;
struct text_pos startp;
void *itdata = NULL;
- int c, max_y = -1, x = 0, y = 0;
+ int c, max_x = 0, max_y = 0, x = 0, y = 0;
CHECK_BUFFER (buffer);
b = XBUFFER (buffer);
end = max (start, min (XINT (to), ZV));
}
- if (!NILP (y_limit))
- {
- CHECK_NUMBER (y_limit);
- max_y = min (XINT (y_limit), INT_MAX);
- }
+ if (!NILP (x_limit) && RANGED_INTEGERP (0, x_limit, INT_MAX))
+ max_x = XINT (x_limit);
+
+ if (NILP (y_limit))
+ max_y = INT_MAX;
+ else if (RANGED_INTEGERP (0, y_limit, INT_MAX))
+ max_y = XINT (y_limit);
itdata = bidi_shelve_cache ();
SET_TEXT_POS (startp, start, CHAR_TO_BYTE (start));
x = move_it_to (&it, end, -1, max_y, -1, MOVE_TO_POS | MOVE_TO_Y);
else
{
- CHECK_NUMBER (x_limit);
- it.last_visible_x = min (XINT (x_limit), INFINITY);
+ it.last_visible_x = max_x;
/* Actually, we never want move_it_to stop at to_x. But to make
sure that move_it_in_display_line_to always moves far enough,
- we set it to INT_MAX and specify MOVE_TO_X. */
- x = move_it_to (&it, end, INT_MAX, max_y, -1,
- MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
+ we set it to INT_MAX and specify MOVE_TO_X. Also bound width
+ value by X-LIMIT. */
+ x = min (move_it_to (&it, end, INT_MAX, max_y, -1,
+ MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y),
+ max_x);
}
- y = it.current_y + it.max_ascent + it.max_descent;
+ /* Subtract height of header-line which was counted automatically by
+ start_display. */
+ y = min (it.current_y + it.max_ascent + it.max_descent
+ - WINDOW_HEADER_LINE_HEIGHT (w),
+ max_y);
- if (!EQ (mode_and_header_line, Qheader_line)
- && !EQ (mode_and_header_line, Qt))
- /* Do not count the header-line which was counted automatically by
- start_display. */
- y = y - WINDOW_HEADER_LINE_HEIGHT (w);
+ if (EQ (mode_and_header_line, Qheader_line)
+ || EQ (mode_and_header_line, Qt))
+ /* Re-add height of header-line as requested. */
+ y = y + WINDOW_HEADER_LINE_HEIGHT (w);
if (EQ (mode_and_header_line, Qmode_line)
|| EQ (mode_and_header_line, Qt))
- /* Do count the mode-line which is not included automatically by
- start_display. */
+ /* Add height of mode-line as requested. */
y = y + WINDOW_MODE_LINE_HEIGHT (w);
bidi_unshelve_cache (itdata, false);
suitable buffer from echo_buffer[] and clear it.
If WHICH < 0, set echo_area_buffer[1] to echo_area_buffer[0], so
- that the current message becomes the last displayed one, make
- choose a suitable buffer for echo_area_buffer[0], and clear it.
+ that the current message becomes the last displayed one, choose a
+ suitable buffer for echo_area_buffer[0], and clear it.
Value is what FN returns. */
echo_area_buffer[this_one] = Qnil;
}
- /* Choose a suitable buffer from echo_buffer[] is we don't
+ /* Choose a suitable buffer from echo_buffer[] if we don't
have one. */
if (NILP (echo_area_buffer[this_one]))
{
&& !XBUFFER (w->contents)->text->redisplay)
continue;
- /* If a window on this frame changed size, report that to
- the user and clear the size-change flag. */
- if (FRAME_WINDOW_SIZES_CHANGED (f))
- {
- Lisp_Object functions;
-
- /* Clear flag first in case we get an error below. */
- FRAME_WINDOW_SIZES_CHANGED (f) = false;
- functions = Vwindow_size_change_functions;
-
- while (CONSP (functions))
- {
- if (!EQ (XCAR (functions), Qt))
- call1 (XCAR (functions), frame);
- functions = XCDR (functions);
- }
- }
-
+ run_window_size_change_functions (frame);
menu_bar_hooks_run = update_menu_bar (f, false, menu_bar_hooks_run);
#ifdef HAVE_WINDOW_SYSTEM
update_tool_bar (f, false);
it's too late for the hooks in window-size-change-functions,
which have been examined already in prepare_menu_bars. So in
that case we call the hooks here only for the selected frame. */
- if (sf->redisplay && FRAME_WINDOW_SIZES_CHANGED (sf))
+ if (sf->redisplay)
{
- Lisp_Object functions;
ptrdiff_t count1 = SPECPDL_INDEX ();
record_unwind_save_match_data ();
-
- /* Clear flag first in case we get an error below. */
- FRAME_WINDOW_SIZES_CHANGED (sf) = false;
- functions = Vwindow_size_change_functions;
-
- while (CONSP (functions))
- {
- if (!EQ (XCAR (functions), Qt))
- call1 (XCAR (functions), selected_frame);
- functions = XCDR (functions);
- }
-
+ run_window_size_change_functions (selected_frame);
unbind_to (count1, Qnil);
}
{
if (sf->redisplay)
{
- Lisp_Object functions;
ptrdiff_t count1 = SPECPDL_INDEX ();
record_unwind_save_match_data ();
-
- /* Clear flag first in case we get an error below. */
- FRAME_WINDOW_SIZES_CHANGED (sf) = false;
- functions = Vwindow_size_change_functions;
-
- while (CONSP (functions))
- {
- if (!EQ (XCAR (functions), Qt))
- call1 (XCAR (functions), selected_frame);
- functions = XCDR (functions);
- }
-
+ run_window_size_change_functions (selected_frame);
unbind_to (count1, Qnil);
}
}
else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf))
{
- Lisp_Object mini_window = FRAME_MINIBUF_WINDOW (sf);
- struct frame *mini_frame;
-
displayed_buffer = XBUFFER (XWINDOW (selected_window)->contents);
/* Use list_of_error, not Qerror, so that
we catch only errors and don't run the debugger. */
list_of_error,
redisplay_window_error);
if (update_miniwindow_p)
- internal_condition_case_1 (redisplay_window_1, mini_window,
- list_of_error,
+ internal_condition_case_1 (redisplay_window_1,
+ FRAME_MINIBUF_WINDOW (sf), list_of_error,
redisplay_window_error);
/* Compare desired and current matrices, perform output. */
have put text on a frame other than the selected one, so the
above call to update_frame would not have caught it. Catch
it here. */
- mini_window = FRAME_MINIBUF_WINDOW (sf);
- mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
+ Lisp_Object mini_window = FRAME_MINIBUF_WINDOW (sf);
+ struct frame *mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
if (mini_frame != sf && FRAME_WINDOW_P (mini_frame))
{
bool last_line_misfit = false;
ptrdiff_t beg_unchanged, end_unchanged;
int frame_line_height;
+ bool use_desired_matrix;
SET_TEXT_POS (lpoint, PT, PT_BYTE);
opoint = lpoint;
startp = run_window_scroll_functions (window, it.current.pos);
/* Redisplay the window. */
- bool use_desired_matrix = false;
+ use_desired_matrix = false;
if (!current_matrix_up_to_date_p
|| windows_or_buffers_changed
|| f->cursor_type_changed
|| NILP (BVAR (buf, enable_multibyte_characters))
/* When we are loading loadup.el, the character property tables
needed for bidi iteration are not yet available. */
- || !NILP (Vpurify_flag))
+ || redisplay__inhibit_bidi)
return Qleft_to_right;
else if (!NILP (BVAR (buf, bidi_paragraph_direction)))
return BVAR (buf, bidi_paragraph_direction);
/* When we are loading loadup.el, the character property
tables needed for bidi iteration are not yet
available. */
- || !NILP (Vpurify_flag))
+ || redisplay__inhibit_bidi)
return Qnil;
validate_subarray (object, from, to, SCHARS (object), &from_pos, &to_pos);
/* When we are loading loadup.el, the character property
tables needed for bidi iteration are not yet
available. */
- || !NILP (Vpurify_flag))
+ || redisplay__inhibit_bidi)
return Qnil;
set_buffer_temp (buf);
the buffer when it becomes large. */);
Vmessage_log_max = make_number (1000);
- DEFVAR_LISP ("window-size-change-functions", Vwindow_size_change_functions,
- doc: /* Functions called during redisplay, if window sizes have changed.
-The value should be a list of functions that take one argument.
-During the first part of redisplay, for each frame, if any of its windows
-have changed size since the last redisplay, or have been split or deleted,
-all the functions in the list are called, with the frame as argument.
-If redisplay decides to resize the minibuffer window, it calls these
-functions on behalf of that as well. */);
- Vwindow_size_change_functions = Qnil;
-
DEFVAR_LISP ("window-scroll-functions", Vwindow_scroll_functions,
doc: /* List of functions to call before redisplaying a window with scrolling.
Each function is called with two arguments, the window and its new
A value of `grow-only', the default, means let mini-windows grow only;
they return to their normal size when the minibuffer is closed, or the
echo area becomes empty. */);
- Vresize_mini_windows = Qgrow_only;
+ /* Contrary to the doc string, we initialize this to nil, so that
+ loading loadup.el won't try to resize windows before loading
+ window.el, where some functions we need to call for this live.
+ We assign the 'grow-only' value right after loading window.el
+ during loadup. */
+ Vresize_mini_windows = Qnil;
DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist,
doc: /* Alist specifying how to blink the cursor off.
DEFVAR_LISP ("redisplay--variables", Vredisplay__variables,
doc: /* A hash-table of variables changing which triggers a thorough redisplay. */);
Vredisplay__variables = Qnil;
+
+ DEFVAR_BOOL ("redisplay--inhibit-bidi", redisplay__inhibit_bidi,
+ doc: /* Non-nil means it is not safe to attempt bidi reordering for display. */);
+ /* Initialize to t, since we need to disable reordering until
+ loadup.el successfully loads charprop.el. */
+ redisplay__inhibit_bidi = true;
}
XFree (tmp_children);
#endif
- if (wm_window == rootw || had_errors)
+ if (had_errors || wm_window == rootw)
break;
win = wm_window;
}
#endif /* not USE_X_TOOLKIT && not USE_GTK */
adjust_frame_glyphs (f);
- run_window_configuration_change_hook (f);
}
Tool tips
***********************************************************************/
-static Lisp_Object x_create_tip_frame (struct x_display_info *,
- Lisp_Object, Lisp_Object);
static void compute_tip_xy (struct frame *, Lisp_Object, Lisp_Object,
Lisp_Object, int, int, int *, int *);
when this happens. */
static Lisp_Object
-x_create_tip_frame (struct x_display_info *dpyinfo,
- Lisp_Object parms,
- Lisp_Object text)
+x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms)
{
struct frame *f;
Lisp_Object frame;
int width, height;
ptrdiff_t count = SPECPDL_INDEX ();
bool face_change_before = face_change;
- Lisp_Object buffer;
- struct buffer *old_buffer;
int x_width = 0, x_height = 0;
if (!dpyinfo->terminal->name)
error ("Invalid frame name--not a string or nil");
frame = Qnil;
- f = make_frame (true);
+ f = make_frame (false);
+ f->wants_modeline = false;
XSETFRAME (frame, f);
-
- AUTO_STRING (tip, " *tip*");
- buffer = Fget_buffer_create (tip);
- /* Use set_window_buffer instead of Fset_window_buffer (see
- discussion of bug#11984, bug#12025, bug#12026). */
- set_window_buffer (FRAME_ROOT_WINDOW (f), buffer, false, false);
- old_buffer = current_buffer;
- set_buffer_internal_1 (XBUFFER (buffer));
- bset_truncate_lines (current_buffer, Qnil);
- specbind (Qinhibit_read_only, Qt);
- specbind (Qinhibit_modification_hooks, Qt);
- Ferase_buffer ();
- Finsert (1, &text);
- set_buffer_internal_1 (old_buffer);
-
record_unwind_protect (unwind_create_tip_frame, frame);
f->terminal = dpyinfo->terminal;
{
Lisp_Object bg = Fframe_parameter (frame, Qbackground_color);
- /* Set tip_frame here, so that */
- tip_frame = frame;
call2 (Qface_set_after_frame_default, frame, Qnil);
if (!EQ (bg, Fframe_parameter (frame, Qbackground_color)))
}
+/* Hide tooltip. Delete its frame if DELETE is true. */
+static Lisp_Object
+x_hide_tip (bool delete)
+{
+ if (!NILP (tip_timer))
+ {
+ call1 (Qcancel_timer, tip_timer);
+ tip_timer = Qnil;
+ }
+
+
+ if (NILP (tip_frame)
+ || (!delete && FRAMEP (tip_frame)
+ && !FRAME_VISIBLE_P (XFRAME (tip_frame))))
+ return Qnil;
+ else
+ {
+ ptrdiff_t count;
+ Lisp_Object was_open = Qnil;
+
+ count = SPECPDL_INDEX ();
+ specbind (Qinhibit_redisplay, Qt);
+ specbind (Qinhibit_quit, Qt);
+
+#ifdef USE_GTK
+ {
+ /* When using system tooltip, tip_frame is the Emacs frame on
+ which the tip is shown. */
+ struct frame *f = XFRAME (tip_frame);
+
+ if (FRAME_LIVE_P (f) && xg_hide_tooltip (f))
+ {
+ tip_frame = Qnil;
+ was_open = Qt;
+ }
+ }
+#endif
+
+ if (FRAMEP (tip_frame))
+ {
+ if (delete)
+ {
+ delete_frame (tip_frame, Qnil);
+ tip_frame = Qnil;
+ }
+ else
+ x_make_frame_invisible (XFRAME (tip_frame));
+
+ was_open = Qt;
+
+#ifdef USE_LUCID
+ /* Bloodcurdling hack alert: The Lucid menu bar widget's
+ redisplay procedure is not called when a tip frame over
+ menu items is unmapped. Redisplay the menu manually... */
+ {
+ Widget w;
+ struct frame *f = SELECTED_FRAME ();
+ if (FRAME_X_P (f) && FRAME_LIVE_P (f))
+ {
+ w = f->output_data.x->menubar_widget;
+
+ if (!DoesSaveUnders (FRAME_DISPLAY_INFO (f)->screen)
+ && w != NULL)
+ {
+ block_input ();
+ xlwmenu_redisplay (w);
+ unblock_input ();
+ }
+ }
+ }
+#endif /* USE_LUCID */
+ }
+ else
+ tip_frame = Qnil;
+
+ return unbind_to (count, was_open);
+ }
+}
+
DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
doc: /* Show STRING in a "tooltip" window on frame FRAME.
A tooltip window is a small X window displaying a string.
Text larger than the specified size is clipped. */)
(Lisp_Object string, Lisp_Object frame, Lisp_Object parms, Lisp_Object timeout, Lisp_Object dx, Lisp_Object dy)
{
- struct frame *f;
+ struct frame *f, *tip_f;
struct window *w;
int root_x, root_y;
struct buffer *old_buffer;
struct text_pos pos;
- int i, width, height;
- bool seen_reversed_p;
+ int width, height;
int old_windows_or_buffers_changed = windows_or_buffers_changed;
ptrdiff_t count = SPECPDL_INDEX ();
+ ptrdiff_t count_1;
+ Lisp_Object window, size;
+ AUTO_STRING (tip, " *tip*");
specbind (Qinhibit_redisplay, Qt);
if (NILP (last_show_tip_args))
last_show_tip_args = Fmake_vector (make_number (3), Qnil);
- if (!NILP (tip_frame))
+ if (FRAMEP (tip_frame) && FRAME_LIVE_P (XFRAME (tip_frame)))
{
Lisp_Object last_string = AREF (last_show_tip_args, 0);
Lisp_Object last_frame = AREF (last_show_tip_args, 1);
Lisp_Object last_parms = AREF (last_show_tip_args, 2);
- if (EQ (frame, last_frame)
- && !NILP (Fequal (last_string, string))
+ if (FRAME_VISIBLE_P (XFRAME (tip_frame))
+ && EQ (frame, last_frame)
+ && !NILP (Fequal_including_properties (last_string, string))
&& !NILP (Fequal (last_parms, parms)))
{
- struct frame *tip_f = XFRAME (tip_frame);
-
/* Only DX and DY have changed. */
+ tip_f = XFRAME (tip_frame);
if (!NILP (tip_timer))
{
Lisp_Object timer = tip_timer;
+
tip_timer = Qnil;
call1 (Qcancel_timer, timer);
}
XMoveWindow (FRAME_X_DISPLAY (tip_f), FRAME_X_WINDOW (tip_f),
root_x, root_y);
unblock_input ();
+
goto start_timer;
}
- }
+ else if (tooltip_reuse_hidden_frame && EQ (frame, last_frame))
+ {
+ bool delete = false;
+ Lisp_Object tail, elt, parm, last;
+
+ /* Check if every parameter in PARMS has the same value in
+ last_parms unless it should be ignored by means of
+ Vtooltip_reuse_hidden_frame_parameters. This may destruct
+ last_parms which, however, will be recreated below. */
+ for (tail = parms; CONSP (tail); tail = XCDR (tail))
+ {
+ elt = XCAR (tail);
+ parm = Fcar (elt);
+ /* The left, top, right and bottom parameters are handled
+ by compute_tip_xy so they can be ignored here. */
+ if (!EQ (parm, Qleft) && !EQ (parm, Qtop)
+ && !EQ (parm, Qright) && !EQ (parm, Qbottom))
+ {
+ last = Fassq (parm, last_parms);
+ if (NILP (Fequal (Fcdr (elt), Fcdr (last))))
+ {
+ /* We lost, delete the old tooltip. */
+ delete = true;
+ break;
+ }
+ else
+ last_parms = call2 (Qassq_delete_all, parm, last_parms);
+ }
+ else
+ last_parms = call2 (Qassq_delete_all, parm, last_parms);
+ }
- /* Hide a previous tip, if any. */
- Fx_hide_tip ();
+ /* Now check if every parameter in what is left of last_parms
+ with a non-nil value has an association in PARMS unless it
+ should be ignored by means of
+ Vtooltip_reuse_hidden_frame_parameters. */
+ for (tail = last_parms; CONSP (tail); tail = XCDR (tail))
+ {
+ elt = XCAR (tail);
+ parm = Fcar (elt);
+ if (!EQ (parm, Qleft) && !EQ (parm, Qtop) && !EQ (parm, Qright)
+ && !EQ (parm, Qbottom) && !NILP (Fcdr (elt)))
+ {
+ /* We lost, delete the old tooltip. */
+ delete = true;
+ break;
+ }
+ }
+
+ x_hide_tip (delete);
+ }
+ else
+ x_hide_tip (true);
+ }
+ else
+ x_hide_tip (true);
ASET (last_show_tip_args, 0, string);
ASET (last_show_tip_args, 1, frame);
ASET (last_show_tip_args, 2, parms);
- /* Add default values to frame parameters. */
- if (NILP (Fassq (Qname, parms)))
- parms = Fcons (Fcons (Qname, build_string ("tooltip")), parms);
- if (NILP (Fassq (Qinternal_border_width, parms)))
- parms = Fcons (Fcons (Qinternal_border_width, make_number (3)), parms);
- if (NILP (Fassq (Qborder_width, parms)))
- parms = Fcons (Fcons (Qborder_width, make_number (1)), parms);
- if (NILP (Fassq (Qbottom_divider_width, parms)))
- parms = Fcons (Fcons (Qbottom_divider_width, make_number (0)), parms);
- if (NILP (Fassq (Qright_divider_width, parms)))
- parms = Fcons (Fcons (Qright_divider_width, make_number (0)), parms);
- if (NILP (Fassq (Qborder_color, parms)))
- parms = Fcons (Fcons (Qborder_color, build_string ("lightyellow")), parms);
- if (NILP (Fassq (Qbackground_color, parms)))
- parms = Fcons (Fcons (Qbackground_color, build_string ("lightyellow")),
- parms);
-
- /* Create a frame for the tooltip, and record it in the global
- variable tip_frame. */
- frame = x_create_tip_frame (FRAME_DISPLAY_INFO (f), parms, string);
- f = XFRAME (frame);
-
- /* Set up the frame's root window. */
- w = XWINDOW (FRAME_ROOT_WINDOW (f));
+ if (!FRAMEP (tip_frame) || !FRAME_LIVE_P (XFRAME (tip_frame)))
+ {
+ /* Add default values to frame parameters. */
+ if (NILP (Fassq (Qname, parms)))
+ parms = Fcons (Fcons (Qname, build_string ("tooltip")), parms);
+ if (NILP (Fassq (Qinternal_border_width, parms)))
+ parms = Fcons (Fcons (Qinternal_border_width, make_number (3)), parms);
+ if (NILP (Fassq (Qborder_width, parms)))
+ parms = Fcons (Fcons (Qborder_width, make_number (1)), parms);
+ if (NILP (Fassq (Qborder_color, parms)))
+ parms = Fcons (Fcons (Qborder_color, build_string ("lightyellow")), parms);
+ if (NILP (Fassq (Qbackground_color, parms)))
+ parms = Fcons (Fcons (Qbackground_color, build_string ("lightyellow")),
+ parms);
+
+ /* Create a frame for the tooltip, and record it in the global
+ variable tip_frame. */
+ if (NILP (tip_frame = x_create_tip_frame (FRAME_DISPLAY_INFO (f), parms)))
+ /* Creating the tip frame failed. */
+ return unbind_to (count, Qnil);
+ }
+
+ tip_f = XFRAME (tip_frame);
+ window = FRAME_ROOT_WINDOW (tip_f);
+ set_window_buffer (window, Fget_buffer_create (tip), false, false);
+ w = XWINDOW (window);
+ w->pseudo_window_p = true;
+
+ /* Set up the frame's root window. Note: The following code does not
+ try to size the window or its frame correctly. Its only purpose is
+ to make the subsequent text size calculations work. The right
+ sizes should get installed when the toolkit gets back to us. */
w->left_col = 0;
w->top_line = 0;
w->pixel_left = 0;
w->total_lines = 40;
}
- w->pixel_width = w->total_cols * FRAME_COLUMN_WIDTH (f);
- w->pixel_height = w->total_lines * FRAME_LINE_HEIGHT (f);
-
- FRAME_TOTAL_COLS (f) = w->total_cols;
- adjust_frame_glyphs (f);
- w->pseudo_window_p = true;
+ w->pixel_width = w->total_cols * FRAME_COLUMN_WIDTH (tip_f);
+ w->pixel_height = w->total_lines * FRAME_LINE_HEIGHT (tip_f);
+ FRAME_TOTAL_COLS (tip_f) = w->total_cols;
+ adjust_frame_glyphs (tip_f);
- /* Display the tooltip text in a temporary buffer. */
+ /* Insert STRING into root window's buffer and fit the frame to the
+ buffer. */
+ count_1 = SPECPDL_INDEX ();
old_buffer = current_buffer;
- set_buffer_internal_1 (XBUFFER (XWINDOW (FRAME_ROOT_WINDOW (f))->contents));
+ set_buffer_internal_1 (XBUFFER (w->contents));
bset_truncate_lines (current_buffer, Qnil);
+ specbind (Qinhibit_read_only, Qt);
+ specbind (Qinhibit_modification_hooks, Qt);
+ specbind (Qinhibit_point_motion_hooks, Qt);
+ Ferase_buffer ();
+ Finsert (1, &string);
clear_glyph_matrix (w->desired_matrix);
clear_glyph_matrix (w->current_matrix);
SET_TEXT_POS (pos, BEGV, BEGV_BYTE);
- try_window (FRAME_ROOT_WINDOW (f), pos, TRY_WINDOW_IGNORE_FONTS_CHANGE);
-
- /* Compute width and height of the tooltip. */
- width = height = 0;
- seen_reversed_p = false;
- for (i = 0; i < w->desired_matrix->nrows; ++i)
- {
- struct glyph_row *row = &w->desired_matrix->rows[i];
- struct glyph *last;
- int row_width;
-
- /* Stop at the first empty row at the end. */
- if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row))
- break;
-
- /* Let the row go over the full width of the frame. */
- row->full_width_p = true;
-
- row_width = row->pixel_width;
- if (row->used[TEXT_AREA])
- {
- /* There's a glyph at the end of rows that is used to place
- the cursor there. Don't include the width of this glyph. */
- if (!row->reversed_p)
- {
- last = &row->glyphs[TEXT_AREA][row->used[TEXT_AREA] - 1];
- if (NILP (last->object))
- row_width -= last->pixel_width;
- }
- else
- {
- /* There could be a stretch glyph at the beginning of R2L
- rows that is produced by extend_face_to_end_of_line.
- Don't count that glyph. */
- struct glyph *g = row->glyphs[TEXT_AREA];
-
- if (g->type == STRETCH_GLYPH && NILP (g->object))
- {
- row_width -= g->pixel_width;
- seen_reversed_p = true;
- }
- }
- }
-
- height += row->height;
- width = max (width, row_width);
- }
-
- /* If we've seen partial-length R2L rows, we need to re-adjust the
- tool-tip frame width and redisplay it again, to avoid over-wide
- tips due to the stretch glyph that extends R2L lines to full
- width of the frame. */
- if (seen_reversed_p)
- {
- /* w->total_cols and FRAME_TOTAL_COLS want the width in columns,
- not in pixels. */
- w->pixel_width = width;
- width /= WINDOW_FRAME_COLUMN_WIDTH (w);
- w->total_cols = width;
- FRAME_TOTAL_COLS (f) = width;
- SET_FRAME_WIDTH (f, width);
- adjust_frame_glyphs (f);
- clear_glyph_matrix (w->desired_matrix);
- clear_glyph_matrix (w->current_matrix);
- try_window (FRAME_ROOT_WINDOW (f), pos, 0);
- width = height = 0;
- /* Recompute width and height of the tooltip. */
- for (i = 0; i < w->desired_matrix->nrows; ++i)
- {
- struct glyph_row *row = &w->desired_matrix->rows[i];
- struct glyph *last;
- int row_width;
-
- if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row))
- break;
- row->full_width_p = true;
- row_width = row->pixel_width;
- if (row->used[TEXT_AREA] && !row->reversed_p)
- {
- last = &row->glyphs[TEXT_AREA][row->used[TEXT_AREA] - 1];
- if (NILP (last->object))
- row_width -= last->pixel_width;
- }
-
- height += row->height;
- width = max (width, row_width);
- }
- }
-
- /* Add the frame's internal border to the width and height the X
- window should have. */
- height += 2 * FRAME_INTERNAL_BORDER_WIDTH (f);
- width += 2 * FRAME_INTERNAL_BORDER_WIDTH (f);
-
- /* Move the tooltip window where the mouse pointer is. Resize and
- show it. */
- compute_tip_xy (f, parms, dx, dy, width, height, &root_x, &root_y);
-
+ try_window (window, pos, TRY_WINDOW_IGNORE_FONTS_CHANGE);
+ /* Calculate size of tooltip window. */
+ size = Fwindow_text_pixel_size (window, Qnil, Qnil, Qnil,
+ make_number (w->pixel_height), Qnil);
+ /* Add the frame's internal border to calculated size. */
+ width = XINT (Fcar (size)) + 2 * FRAME_INTERNAL_BORDER_WIDTH (tip_f);
+ height = XINT (Fcdr (size)) + 2 * FRAME_INTERNAL_BORDER_WIDTH (tip_f);
+
+ /* Calculate position of tooltip frame. */
+ compute_tip_xy (tip_f, parms, dx, dy, width, height, &root_x, &root_y);
+
+ /* Show tooltip frame. */
block_input ();
- XMoveResizeWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+ XMoveResizeWindow (FRAME_X_DISPLAY (tip_f), FRAME_X_WINDOW (tip_f),
root_x, root_y, width, height);
- XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
+ XMapRaised (FRAME_X_DISPLAY (tip_f), FRAME_X_WINDOW (tip_f));
unblock_input ();
- /* Draw into the window. */
w->must_be_updated_p = true;
update_single_window (w);
-
- /* Restore original current buffer. */
set_buffer_internal_1 (old_buffer);
+ unbind_to (count_1, Qnil);
windows_or_buffers_changed = old_windows_or_buffers_changed;
start_timer:
Value is t if tooltip was open, nil otherwise. */)
(void)
{
- ptrdiff_t count;
- Lisp_Object deleted, frame, timer;
-
- /* Return quickly if nothing to do. */
- if (NILP (tip_timer) && NILP (tip_frame))
- return Qnil;
-
- frame = tip_frame;
- timer = tip_timer;
- tip_frame = tip_timer = deleted = Qnil;
-
- count = SPECPDL_INDEX ();
- specbind (Qinhibit_redisplay, Qt);
- specbind (Qinhibit_quit, Qt);
-
- if (!NILP (timer))
- call1 (Qcancel_timer, timer);
-
-#ifdef USE_GTK
- {
- /* When using system tooltip, tip_frame is the Emacs frame on which
- the tip is shown. */
- struct frame *f = XFRAME (frame);
- if (FRAME_LIVE_P (f) && xg_hide_tooltip (f))
- frame = Qnil;
- }
-#endif
-
- if (FRAMEP (frame))
- {
- delete_frame (frame, Qnil);
- deleted = Qt;
-
-#ifdef USE_LUCID
- /* Bloodcurdling hack alert: The Lucid menu bar widget's
- redisplay procedure is not called when a tip frame over menu
- items is unmapped. Redisplay the menu manually... */
- {
- Widget w;
- struct frame *f = SELECTED_FRAME ();
- if (FRAME_X_P (f) && FRAME_LIVE_P (f))
- {
- w = f->output_data.x->menubar_widget;
-
- if (!DoesSaveUnders (FRAME_DISPLAY_INFO (f)->screen)
- && w != NULL)
- {
- block_input ();
- xlwmenu_redisplay (w);
- unblock_input ();
- }
- }
- }
-#endif /* USE_LUCID */
- }
-
- return unbind_to (count, deleted);
+ return x_hide_tip (!tooltip_reuse_hidden_frame);
}
-
\f
/***********************************************************************
File selection dialog
DEFSYM (Qcancel_timer, "cancel-timer");
DEFSYM (Qfont_param, "font-parameter");
DEFSYM (Qmono, "mono");
+ DEFSYM (Qassq_delete_all, "assq-delete-all");
#ifdef USE_CAIRO
DEFSYM (Qpdf, "pdf");
(multi-file (0 1))))
"`package-desc' used for testing dependencies.")
-(defvar package-test-data-dir (expand-file-name "data/package" package-test-file-dir)
+(defvar package-test-data-dir (expand-file-name "package-resources" package-test-file-dir)
"Base directory of package test files.")
(defvar package-test-fake-contents-file
(ert-deftest package-test-desc-from-buffer ()
"Parse an elisp buffer to get a `package-desc' object."
- (with-package-test (:basedir "data/package" :file "simple-single-1.3.el")
+ (with-package-test (:basedir "package-resources" :file "simple-single-1.3.el")
(should (equal (package-buffer-info) simple-single-desc)))
- (with-package-test (:basedir "data/package" :file "simple-depend-1.0.el")
+ (with-package-test (:basedir "package-resources" :file "simple-depend-1.0.el")
(should (equal (package-buffer-info) simple-depend-desc)))
- (with-package-test (:basedir "data/package"
+ (with-package-test (:basedir "package-resources"
:file "multi-file-0.2.3.tar")
(tar-mode)
(should (equal (package-tar-file-info) multi-file-desc))))
(ert-deftest package-test-install-single ()
"Install a single file without using an archive."
- (with-package-test (:basedir "data/package" :file "simple-single-1.3.el")
+ (with-package-test (:basedir "package-resources" :file "simple-single-1.3.el")
(should (package-install-from-buffer))
(package-initialize)
(should (package-installed-p 'simple-single))
(ert-deftest package-test-macro-compilation ()
"Install a package which includes a dependency."
- (with-package-test (:basedir "data/package")
+ (with-package-test (:basedir "package-resources")
(package-install-file (expand-file-name "macro-problem-package-1.0/"))
(require 'macro-problem)
;; `macro-problem-func' uses a macro from `macro-aux'.
(ert-deftest package-test-install-prioritized ()
"Install a lower version from a higher-prioritized archive."
(with-package-test ()
- (let* ((newer-version (expand-file-name "data/package/newer-versions"
+ (let* ((newer-version (expand-file-name "package-resources/newer-versions"
package-test-file-dir))
(package-archives `(("older" . ,package-test-data-dir)
("newer" . ,newer-version)))
(ert-deftest package-test-install-multifile ()
"Check properties of the installed multi-file package."
- (with-package-test (:basedir "data/package" :install '(multi-file))
+ (with-package-test (:basedir "package-resources" :install '(multi-file))
(let ((autoload-file
(expand-file-name "multi-file-autoloads.el"
(expand-file-name
(package-menu-execute)
(should (package-installed-p 'simple-single))
(let ((package-test-data-dir
- (expand-file-name "data/package/newer-versions" package-test-file-dir)))
+ (expand-file-name "package-resources/newer-versions" package-test-file-dir)))
(setq package-archives `(("gnu" . ,package-test-data-dir)))
(package-menu-refresh)
(cons (format "HOME=%s" homedir)
process-environment)))
(epg-check-configuration (epg-configuration))
- t)
+ (epg-find-configuration 'OpenPGP))
(delete-directory homedir t)))))
(let* ((keyring (expand-file-name "key.pub" package-test-data-dir))
(package-test-data-dir
- (expand-file-name "data/package/signed" package-test-file-dir)))
+ (expand-file-name "package-resources/signed" package-test-file-dir)))
(with-package-test ()
(package-initialize)
(package-import-keyring keyring)
(ert-deftest package-x-test-upload-buffer ()
"Test creating an \"archive-contents\" file"
- (with-package-test (:basedir "data/package"
+ (with-package-test (:basedir "package-resources"
:file "simple-single-1.3.el"
:upload-base t)
(package-upload-buffer)
(ert-deftest package-x-test-upload-new-version ()
"Test uploading a new version of a package"
- (with-package-test (:basedir "data/package"
+ (with-package-test (:basedir "package-resources"
:file "simple-single-1.3.el"
:upload-base t)
(package-upload-buffer)
simple-depend-desc-2)))
(should
(equal (package--sort-by-dependence delete-list)
+
(list simple-depend-desc-2 simple-depend-desc-1 new-pkg-desc
multi-file-desc simple-depend-desc simple-single-desc)))
(should
;; It's confused by the closing paren in the middle.
(ruby-assert-state s 8 nil)))
+ (ert-deftest ruby-interpolation-inside-another-interpolation ()
+ :expected-result :failed
+ (let ((s "\"#{[a, b, c].map { |v| \"#{v}\" }.join}\""))
+ (ruby-assert-face s 1 font-lock-string-face)
+ (ruby-assert-face s 2 font-lock-variable-name-face)
+ (ruby-assert-face s 38 font-lock-string-face)
+ (ruby-assert-state s 8 nil)))
+
(ert-deftest ruby-interpolation-inside-double-quoted-percent-literals ()
(ruby-assert-face "%Q{foo #@bar}" 8 font-lock-variable-name-face)
(ruby-assert-face "%W{foo #@bar}" 8 font-lock-variable-name-face)
# Don't propertize percent literals inside strings.
"(%s, %s)" % [123, 456]
- "abc/#{def}ghi"
- "abc\#{def}ghi"
+ "abc/#{ddf}ghi"
+ "abc\#{ddf}ghi"
# Or inside comments.
x = # "tot %q/to"; =
bar
# https://github.com/rails/rails/blob/17f5d8e062909f1fcae25351834d8e89967b645e/activesupport/lib/active_support/time_with_zone.rb#L206
- foo
+ foo # comment intended to confuse the tokenizer
.bar
z = {
tee < qux
zux do
- foo == bar and
+ foo == bar &&
tee == qux
+
+ a = 3 and
+ b = 4
end
+ foo + bar ==
+ tee + qux
+
+ 1 .. 2 &&
+ 3
+
+ 3 < 4 +
+ 5
+
+ 10 << 4 ^
+ 20
+
+ 100 + 2 >>
+ 3
+
+ 2 ** 10 /
+ 2
+
foo ^
bar
foo_bar_tee(1, 2, 3)
- .qux.bar
- .tee
+ .qux&.bar
+ .tee.bar
+ &.tee
foo do
bar
.baz
end
+ abc(foo
+ .bar,
+ tee
+ .qux)
+
# http://stackoverflow.com/questions/17786563/emacs-ruby-mode-if-expressions-indentation
tee = if foo
bar
a.records().map(&:b).zip(
foo)
+ foo1 =
+ subject.update(
+ 1
+ )
+
+ foo2 =
+ subject.
+ update(
+ 2
+ )
+
# FIXME: This is not consistent with the example below it, but this
# offset only happens if the colon is at eol, which wouldn't be often.
# Tokenizing `bar:' as `:bar =>' would be better, but it's hard to
foo(:bar =>
tee)
+ regions = foo(
+ OpenStruct.new(id: 0, name: "foo") => [
+ 10
+ ]
+ )
+
{'a' => {
'b' => 'c',
'd' => %w(e f)