------------------------------------------------------------ revno: 115454 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-12-10 21:37:30 -0800 message: Remove the option of using libcrypto. This scorches the earth and waits for spring; see Ted Zlatanov and Stefan Monnier in . * configure.ac (with_openssl_default, HAVE_LIB_CRYPTO): Remove. Do not say whether Emacs is configured to use a crypto library, since it's no longer an option. (gl_CRYPTO_CHECK): Define a dummy. * lib/gl_openssl.h, m4/gl-openssl.m4: Remove. * admin/merge-gnulib: Remove lib/gl_openssh.h and m4/gl-openssl.m4. * src/Makefile.in (LIB_CRYPTO): Remove. (LIBES): Don't use it. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-10 02:44:28 +0000 +++ ChangeLog 2013-12-11 05:37:30 +0000 @@ -1,3 +1,15 @@ +2013-12-11 Paul Eggert + + Remove the option of using libcrypto. + This scorches the earth and waits for spring; + see Ted Zlatanov and Stefan Monnier in + . + * configure.ac (with_openssl_default, HAVE_LIB_CRYPTO): Remove. + Do not say whether Emacs is configured to use a crypto library, + since it's no longer an option. + (gl_CRYPTO_CHECK): Define a dummy. + * lib/gl_openssl.h, m4/gl-openssl.m4: Remove. + 2013-12-10 Paul Eggert * configure.ac: Disable libcrypto by default. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-12-04 16:58:05 +0000 +++ admin/ChangeLog 2013-12-11 05:37:30 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Paul Eggert + + Remove the option of using libcrypto. + * merge-gnulib: Remove lib/gl_openssh.h and m4/gl-openssl.m4. + 2013-12-04 Eli Zaretskii * unidata/unidata-gen.el (unidata-prop-alist): Update bidi-class === modified file 'admin/merge-gnulib' --- admin/merge-gnulib 2013-10-07 21:37:19 +0000 +++ admin/merge-gnulib 2013-12-11 05:37:30 +0000 @@ -91,7 +91,8 @@ } "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && -rm -- "$src"m4/fcntl-o.m4 "$src"m4/gnulib-cache.m4 "$src"m4/warn-on-use.m4 && +rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \ + "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux && autoreconf -i -I m4 -- ${src:+"$src"} === modified file 'configure.ac' --- configure.ac 2013-12-10 02:44:28 +0000 +++ configure.ac 2013-12-11 05:37:30 +0000 @@ -94,8 +94,7 @@ [AS_HELP_STRING([--without-all], [omit almost all features and build small executable with minimal dependencies])], - [with_features=$withval - with_openssl_default=$withval], + [with_features=$withval], [with_features=yes]) dnl OPTION_DEFAULT_OFF(NAME, HELP-STRING) @@ -640,6 +639,8 @@ dnl that clash with MinGW. AM_CONDITIONAL([BUILDING_FOR_WINDOWSNT], [test "x$opsys" = "xmingw32"]) +# Avoid gnulib's tests for -lcrypto, so that there's no static dependency on it. +AC_DEFUN([gl_CRYPTO_CHECK]) # Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW, # as we don't use them. AC_DEFUN([gl_FCNTL_O_FLAGS]) @@ -4848,12 +4849,6 @@ acl_summary=no fi -if test -n "$LIB_CRYPTO"; then - HAVE_LIB_CRYPTO=yes -else - HAVE_LIB_CRYPTO=no -fi - echo " Configured for \`${canonical}'. @@ -4893,7 +4888,6 @@ echo " Does Emacs use GSettings? ${HAVE_GSETTINGS}" echo " Does Emacs use a file notification library? ${NOTIFY_SUMMARY}" echo " Does Emacs use access control lists? ${acl_summary}" -echo " Does Emacs use a crypto library? ${HAVE_LIB_CRYPTO} $LIB_CRYPTO" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" === removed file 'lib/gl_openssl.h' --- lib/gl_openssl.h 2013-12-08 08:05:36 +0000 +++ lib/gl_openssl.h 1970-01-01 00:00:00 +0000 @@ -1,116 +0,0 @@ -/* gl_openssl.h -- wrap openssl crypto hash routines in gnulib interface - - Copyright (C) 2013 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* Written by Pádraig Brady */ - -#ifndef GL_OPENSSL_NAME -# error "Please define GL_OPENSSL_NAME to 1,5,256 etc." -#endif - -#ifndef _GL_INLINE_HEADER_BEGIN -# error "Please include config.h first." -#endif -_GL_INLINE_HEADER_BEGIN -#ifndef GL_OPENSSL_INLINE -# define GL_OPENSSL_INLINE _GL_INLINE -#endif - -/* Concatenate two preprocessor tokens. */ -#define _GLCRYPTO_CONCAT_(prefix, suffix) prefix##suffix -#define _GLCRYPTO_CONCAT(prefix, suffix) _GLCRYPTO_CONCAT_ (prefix, suffix) - -#if GL_OPENSSL_NAME == 5 -# define OPENSSL_ALG md5 -#else -# define OPENSSL_ALG _GLCRYPTO_CONCAT (sha, GL_OPENSSL_NAME) -#endif - -/* Context type mappings. */ -#if BASE_OPENSSL_TYPE != GL_OPENSSL_NAME -# undef BASE_OPENSSL_TYPE -# if GL_OPENSSL_NAME == 224 -# define BASE_OPENSSL_TYPE 256 -# elif GL_OPENSSL_NAME == 384 -# define BASE_OPENSSL_TYPE 512 -# endif -# define md5_CTX MD5_CTX -# define sha1_CTX SHA_CTX -# define sha224_CTX SHA256_CTX -# define sha224_ctx sha256_ctx -# define sha256_CTX SHA256_CTX -# define sha384_CTX SHA512_CTX -# define sha384_ctx sha512_ctx -# define sha512_CTX SHA512_CTX -# undef _gl_CTX -# undef _gl_ctx -# define _gl_CTX _GLCRYPTO_CONCAT (OPENSSL_ALG, _CTX) /* openssl type. */ -# define _gl_ctx _GLCRYPTO_CONCAT (OPENSSL_ALG, _ctx) /* gnulib type. */ - -struct _gl_ctx { _gl_CTX CTX; }; -#endif - -/* Function name mappings. */ -#define md5_prefix MD5 -#define sha1_prefix SHA1 -#define sha224_prefix SHA224 -#define sha256_prefix SHA256 -#define sha384_prefix SHA384 -#define sha512_prefix SHA512 -#define _GLCRYPTO_PREFIX _GLCRYPTO_CONCAT (OPENSSL_ALG, _prefix) -#define OPENSSL_FN(suffix) _GLCRYPTO_CONCAT (_GLCRYPTO_PREFIX, suffix) -#define GL_CRYPTO_FN(suffix) _GLCRYPTO_CONCAT (OPENSSL_ALG, suffix) - -GL_OPENSSL_INLINE void -GL_CRYPTO_FN (_init_ctx) (struct _gl_ctx *ctx) -{ (void) OPENSSL_FN (_Init) ((_gl_CTX *) ctx); } - -/* These were never exposed by gnulib. */ -#if ! (GL_OPENSSL_NAME == 224 || GL_OPENSSL_NAME == 384) -GL_OPENSSL_INLINE void -GL_CRYPTO_FN (_process_bytes) (const void *buf, size_t len, struct _gl_ctx *ctx) -{ OPENSSL_FN (_Update) ((_gl_CTX *) ctx, buf, len); } - -GL_OPENSSL_INLINE void -GL_CRYPTO_FN (_process_block) (const void *buf, size_t len, struct _gl_ctx *ctx) -{ GL_CRYPTO_FN (_process_bytes) (buf, len, ctx); } -#endif - -GL_OPENSSL_INLINE void * -GL_CRYPTO_FN (_finish_ctx) (struct _gl_ctx *ctx, void *res) -{ OPENSSL_FN (_Final) (res, (_gl_CTX *) ctx); return res; } - -GL_OPENSSL_INLINE void * -GL_CRYPTO_FN (_buffer) (const char *buf, size_t len, void *res) -{ return OPENSSL_FN () ((const unsigned char *) buf, len, res); } - -GL_OPENSSL_INLINE void * -GL_CRYPTO_FN (_read_ctx) (const struct _gl_ctx *ctx, void *res) -{ - /* Assume any unprocessed bytes in ctx are not to be ignored. */ - _gl_CTX tmp_ctx = *(_gl_CTX *) ctx; - OPENSSL_FN (_Final) (res, &tmp_ctx); - return res; -} - -/* Undef so we can include multiple times. */ -#undef GL_CRYPTO_FN -#undef OPENSSL_FN -#undef _GLCRYPTO_PREFIX -#undef OPENSSL_ALG -#undef GL_OPENSSL_NAME - -_GL_INLINE_HEADER_END === removed file 'm4/gl-openssl.m4' --- m4/gl-openssl.m4 2013-12-10 02:44:28 +0000 +++ m4/gl-openssl.m4 1970-01-01 00:00:00 +0000 @@ -1,51 +0,0 @@ -# gl-openssl.m4 serial 3 -dnl Copyright (C) 2013 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_SET_CRYPTO_CHECK_DEFAULT], -[ - m4_define([gl_CRYPTO_CHECK_DEFAULT], [$1]) -]) -gl_SET_CRYPTO_CHECK_DEFAULT([no]) - -AC_DEFUN([gl_CRYPTO_CHECK], -[ - dnl gnulib users set this before gl_INIT with gl_SET_CRYPTO_CHECK_DEFAULT() - m4_divert_once([DEFAULTS], [with_openssl_default='gl_CRYPTO_CHECK_DEFAULT']) - - dnl Only clear once, so crypto routines can be checked for individually - m4_divert_once([DEFAULTS], [LIB_CRYPTO=]) - - AC_ARG_WITH([openssl], - [AS_HELP_STRING([--with-openssl], - [use libcrypto hash routines. Valid ARGs are: - 'yes', 'no', 'auto' => use if available, - 'optional' => use if available and warn if not available; - default is ']gl_CRYPTO_CHECK_DEFAULT['])], - [], - [with_openssl=$with_openssl_default]) - - if test "x$1" = xMD5; then - ALG_header=md5.h - else - ALG_header=sha.h - fi - - AC_SUBST([LIB_CRYPTO]) - if test "x$with_openssl" != xno; then - AC_CHECK_LIB([crypto], [$1], - [AC_CHECK_HEADERS([openssl/$ALG_header], - [LIB_CRYPTO=-lcrypto - AC_DEFINE([HAVE_OPENSSL_$1], [1], - [Define to 1 if libcrypto is used for $1.])])]) - if test "x$LIB_CRYPTO" = x; then - if test "x$with_openssl" = xyes; then - AC_MSG_ERROR([openssl development library not found for $1]) - elif test "x$with_openssl" = xoptional; then - AC_MSG_WARN([openssl development library not found for $1]) - fi - fi - fi -]) === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-11 00:32:00 +0000 +++ src/ChangeLog 2013-12-11 05:37:30 +0000 @@ -1,3 +1,9 @@ +2013-12-11 Paul Eggert + + Remove the option of using libcrypto. + * Makefile.in (LIB_CRYPTO): Remove. + (LIBES): Don't use it. + 2013-12-11 Juri Linkov * term.c (term_get_fkeys_1): Remove non-standard IBM terminfo === modified file 'src/Makefile.in' --- src/Makefile.in 2013-12-08 08:05:36 +0000 +++ src/Makefile.in 2013-12-11 05:37:30 +0000 @@ -139,7 +139,6 @@ LIB_ACL=@LIB_ACL@ LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@ -LIB_CRYPTO=@LIB_CRYPTO@ LIB_EACCESS=@LIB_EACCESS@ LIB_FDATASYNC=@LIB_FDATASYNC@ LIB_TIMER_TIME=@LIB_TIMER_TIME@ @@ -404,7 +403,6 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ $(LIBX_OTHER) $(LIBSOUND) \ $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ - $(LIB_CRYPTO) \ $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) \ $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ ------------------------------------------------------------ revno: 115453 fixes bug: http://debbugs.gnu.org/13312 committer: Juri Linkov branch nick: trunk timestamp: Wed 2013-12-11 03:11:24 +0200 message: * lisp/delsel.el (delete-active-region): Let-bind `this-command' to prevent `kill-region' from changing its original value. (delete-selection-helper): Handle `overwrite-mode' for the type `kill' exactly the same way as for the type `t'. (insert-char, quoted-insert, reindent-then-newline-and-indent): Support more commands. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 00:45:10 +0000 +++ lisp/ChangeLog 2013-12-11 01:11:24 +0000 @@ -1,5 +1,14 @@ 2013-12-11 Juri Linkov + * delsel.el (delete-active-region): Let-bind `this-command' + to prevent `kill-region' from changing its original value. + (delete-selection-helper): Handle `overwrite-mode' for the type + `kill' exactly the same way as for the type `t'. + (insert-char, quoted-insert, reindent-then-newline-and-indent): + Support more commands. (Bug#13312) + +2013-12-11 Juri Linkov + * bindings.el: Map kp keys to non-kp keys systematically with basic modifiers control, meta and shift. (Bug#14397) === modified file 'lisp/delsel.el' --- lisp/delsel.el 2013-12-08 04:20:50 +0000 +++ lisp/delsel.el 2013-12-11 01:11:24 +0000 @@ -78,7 +78,9 @@ "Delete the active region. If KILLP in not-nil, the active region is killed instead of deleted." (if killp - (kill-region (point) (mark) t) + ;; Don't allow `kill-region' to change the value of `this-command'. + (let (this-command) + (kill-region (point) (mark) t)) (funcall region-extract-function 'delete-only)) t) @@ -102,7 +104,13 @@ FUNCTION should take no argument and return one of the above values or nil." (condition-case data (cond ((eq type 'kill) - (delete-active-region t)) + (delete-active-region t) + (if (and overwrite-mode + (eq this-command 'self-insert-command)) + (let ((overwrite-mode nil)) + (self-insert-command + (prefix-numeric-value current-prefix-arg)) + (setq this-command 'ignore)))) ((eq type 'yank) ;; Before a yank command, make sure we don't yank the ;; head of the kill-ring that really comes from the @@ -165,10 +173,14 @@ (not (run-hook-with-args-until-success 'self-insert-uses-region-functions)))) +(put 'insert-char 'delete-selection t) +(put 'quoted-insert 'delete-selection t) + (put 'yank 'delete-selection 'yank) (put 'clipboard-yank 'delete-selection 'yank) (put 'insert-register 'delete-selection t) +(put 'reindent-then-newline-and-indent 'delete-selection t) (put 'newline-and-indent 'delete-selection t) (put 'newline 'delete-selection t) (put 'open-line 'delete-selection 'kill) @@ -197,9 +209,9 @@ (define-key minibuffer-local-completion-map "\C-g" 'abort-recursive-edit) (define-key minibuffer-local-must-match-map "\C-g" 'abort-recursive-edit) (define-key minibuffer-local-isearch-map "\C-g" 'abort-recursive-edit) - (dolist (sym '(self-insert-command yank clipboard-yank + (dolist (sym '(self-insert-command insert-char quoted-insert yank clipboard-yank insert-register - newline-and-indent newline open-line)) + reindent-then-newline-and-indent newline-and-indent newline open-line)) (put sym 'delete-selection nil)) ;; continue standard unloading nil) ------------------------------------------------------------ revno: 115452 fixes bug: http://debbugs.gnu.org/14397 committer: Juri Linkov branch nick: trunk timestamp: Wed 2013-12-11 02:45:10 +0200 message: * lisp/bindings.el: Map kp keys to non-kp keys systematically with basic modifiers control, meta and shift. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 00:27:27 +0000 +++ lisp/ChangeLog 2013-12-11 00:45:10 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Juri Linkov + + * bindings.el: Map kp keys to non-kp keys systematically + with basic modifiers control, meta and shift. (Bug#14397) + 2013-12-11 Kenjiro NAKAYAMA (tiny change) * net/eww.el (eww-mode-map): Instead of "Quit" show "Exit" and === modified file 'lisp/bindings.el' --- lisp/bindings.el 2013-11-11 05:18:53 +0000 +++ lisp/bindings.el 2013-12-11 00:45:10 +0000 @@ -1056,36 +1056,30 @@ ;; FIXME: rather than list such mappings for every modifier-combination, ;; we should come up with a way to do it generically, something like ;; (define-key function-key-map [*-kp-home] [*-home]) -(define-key function-key-map [kp-home] [home]) -(define-key function-key-map [kp-left] [left]) -(define-key function-key-map [kp-up] [up]) -(define-key function-key-map [kp-right] [right]) -(define-key function-key-map [kp-down] [down]) -(define-key function-key-map [kp-prior] [prior]) -(define-key function-key-map [kp-next] [next]) -(define-key function-key-map [M-kp-next] [M-next]) -(define-key function-key-map [kp-end] [end]) -(define-key function-key-map [kp-begin] [begin]) -(define-key function-key-map [kp-insert] [insert]) +;; Currently we add keypad key combinations with basic modifiers +;; (to complement plain bindings in "Keypad support" section in simple.el) +;; Until [*-kp-home] is implemented, for more modifiers we could also use: +;; (todo-powerset '(control meta shift hyper super alt)) (Bug#14397) +(let ((modifiers '(nil (control) (meta) (control meta) (shift) + (control shift) (meta shift) (control meta shift))) + (keys '((kp-delete delete) (kp-insert insert) + (kp-end end) (kp-down down) (kp-next next) + (kp-left left) (kp-begin begin) (kp-right right) + (kp-home home) (kp-up up) (kp-prior prior) + (kp-enter enter) (kp-decimal ?.) + (kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4) + (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9) + (kp-add +) (kp-subtract -) (kp-multiply *) (kp-divide /)))) + (dolist (pair keys) + (dolist (mod modifiers) + (define-key function-key-map + (vector (append mod (list (nth 0 pair)))) + (vector (append mod (list (nth 1 pair)))))))) + (define-key function-key-map [backspace] [?\C-?]) (define-key function-key-map [delete] [?\C-?]) (define-key function-key-map [kp-delete] [?\C-?]) -(define-key function-key-map [S-kp-end] [S-end]) -(define-key function-key-map [S-kp-down] [S-down]) -(define-key function-key-map [S-kp-next] [S-next]) -(define-key function-key-map [S-kp-left] [S-left]) -(define-key function-key-map [S-kp-right] [S-right]) -(define-key function-key-map [S-kp-home] [S-home]) -(define-key function-key-map [S-kp-up] [S-up]) -(define-key function-key-map [S-kp-prior] [S-prior]) -(define-key function-key-map [C-S-kp-end] [C-S-end]) -(define-key function-key-map [C-S-kp-down] [C-S-down]) -(define-key function-key-map [C-S-kp-next] [C-S-next]) -(define-key function-key-map [C-S-kp-left] [C-S-left]) -(define-key function-key-map [C-S-kp-right] [C-S-right]) -(define-key function-key-map [C-S-kp-home] [C-S-home]) -(define-key function-key-map [C-S-kp-up] [C-S-up]) -(define-key function-key-map [C-S-kp-prior] [C-S-prior]) + ;; Don't bind shifted keypad numeric keys, they reportedly ;; interfere with the feature of some keyboards to produce ;; numbers when NumLock is off. @@ -1097,14 +1091,14 @@ ;(define-key function-key-map [S-kp-7] [S-home]) ;(define-key function-key-map [S-kp-8] [S-up]) ;(define-key function-key-map [S-kp-9] [S-prior]) -(define-key function-key-map [C-S-kp-1] [C-S-end]) -(define-key function-key-map [C-S-kp-2] [C-S-down]) -(define-key function-key-map [C-S-kp-3] [C-S-next]) -(define-key function-key-map [C-S-kp-4] [C-S-left]) -(define-key function-key-map [C-S-kp-6] [C-S-right]) -(define-key function-key-map [C-S-kp-7] [C-S-home]) -(define-key function-key-map [C-S-kp-8] [C-S-up]) -(define-key function-key-map [C-S-kp-9] [C-S-prior]) +;(define-key function-key-map [C-S-kp-1] [C-S-end]) +;(define-key function-key-map [C-S-kp-2] [C-S-down]) +;(define-key function-key-map [C-S-kp-3] [C-S-next]) +;(define-key function-key-map [C-S-kp-4] [C-S-left]) +;(define-key function-key-map [C-S-kp-6] [C-S-right]) +;(define-key function-key-map [C-S-kp-7] [C-S-home]) +;(define-key function-key-map [C-S-kp-8] [C-S-up]) +;(define-key function-key-map [C-S-kp-9] [C-S-prior]) ;; Hitting C-SPC on text terminals, usually sends the ascii code 0 (aka C-@), ;; so we can't distinguish those two keys, but usually we consider C-SPC ------------------------------------------------------------ revno: 115451 fixes bug: http://debbugs.gnu.org/13471 committer: Juri Linkov branch nick: trunk timestamp: Wed 2013-12-11 02:32:00 +0200 message: * src/term.c (term_get_fkeys_1): Remove non-standard IBM terminfo as obsolete to avoid conflicts with . diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-10 03:36:36 +0000 +++ src/ChangeLog 2013-12-11 00:32:00 +0000 @@ -1,3 +1,8 @@ +2013-12-11 Juri Linkov + + * term.c (term_get_fkeys_1): Remove non-standard IBM terminfo + as obsolete to avoid conflicts with . (Bug#13471) + 2013-12-10 Dmitry Antipov * xdisp.c (display_tool_bar_line): Don't extend on a previously === modified file 'src/term.c' --- src/term.c 2013-11-30 09:25:31 +0000 +++ src/term.c 2013-12-11 00:32:00 +0000 @@ -1422,18 +1422,6 @@ CONDITIONAL_REASSIGN ("kD", "kI", "insert"); /* if there's no key_end keycap, map key_ll to 'end' keysym */ CONDITIONAL_REASSIGN ("@7", "kH", "end"); - - /* IBM has their own non-standard dialect of terminfo. - If the standard name isn't found, try the IBM name. */ - CONDITIONAL_REASSIGN ("kB", "KO", "backtab"); - CONDITIONAL_REASSIGN ("@4", "kJ", "execute"); /* actually "action" */ - CONDITIONAL_REASSIGN ("@4", "kc", "execute"); /* actually "command" */ - CONDITIONAL_REASSIGN ("%7", "ki", "menu"); - CONDITIONAL_REASSIGN ("@7", "kw", "end"); - CONDITIONAL_REASSIGN ("F1", "k<", "f11"); - CONDITIONAL_REASSIGN ("F2", "k>", "f12"); - CONDITIONAL_REASSIGN ("%1", "kq", "help"); - CONDITIONAL_REASSIGN ("*6", "kU", "select"); #undef CONDITIONAL_REASSIGN } ------------------------------------------------------------ revno: 115450 author: Kenjiro NAKAYAMA committer: Ted Zlatanov branch nick: quickfixes timestamp: Tue 2013-12-10 19:27:27 -0500 message: eww easy-menu fixes * net/eww.el (eww-mode-map): Instead of "Quit" show "Exit" and "Close browser" menu items. Fix wrong function of "List bookmarks". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-11 00:11:26 +0000 +++ lisp/ChangeLog 2013-12-11 00:27:27 +0000 @@ -1,3 +1,9 @@ +2013-12-11 Kenjiro NAKAYAMA (tiny change) + + * net/eww.el (eww-mode-map): Instead of "Quit" show "Exit" and + "Close browser" menu items. Fix wrong function of "List + bookmarks". + 2013-12-11 Juri Linkov * misearch.el (multi-isearch-buffers): Set the value of === modified file 'lisp/net/eww.el' --- lisp/net/eww.el 2013-12-05 16:04:53 +0000 +++ lisp/net/eww.el 2013-12-11 00:27:27 +0000 @@ -418,7 +418,8 @@ (easy-menu-define nil map "" '("Eww" - ["Quit" eww-quit t] + ["Exit" eww-quit t] + ["Close browser" quit-window t] ["Reload" eww-reload t] ["Back to previous page" eww-back-url :active (not (zerop (length eww-history)))] @@ -429,7 +430,7 @@ ["View page source" eww-view-source] ["Copy page URL" eww-copy-page-url t] ["Add bookmark" eww-add-bookmark t] - ["List bookmarks" eww-copy-page-url t] + ["List bookmarks" eww-list-bookmarks t] ["List cookies" url-cookie-list t])) map)) ------------------------------------------------------------ revno: 115449 fixes bug: http://debbugs.gnu.org/16035 committer: Juri Linkov branch nick: trunk timestamp: Wed 2013-12-11 02:11:26 +0200 message: * lisp/misearch.el (multi-isearch-buffers): Set the value of `multi-isearch-buffer-list' globally. Set NO-RECURSIVE-EDIT arg of isearch-forward to t. (multi-isearch-buffers-regexp): Set the value of `multi-isearch-buffer-list' globally. Set NO-RECURSIVE-EDIT arg of isearch-forward-regexp to t. (multi-isearch-files): Set the value of `multi-isearch-file-list' globally. Set NO-RECURSIVE-EDIT arg of isearch-forward to t. (multi-isearch-files-regexp): Set the value of `multi-isearch-file-list globally. Set NO-RECURSIVE-EDIT arg of isearch-forward-regexp to t. * lisp/dired-aux.el (dired-isearch-filenames): Set NO-RECURSIVE-EDIT arg of isearch-forward to t. (dired-isearch-filenames-regexp): Set NO-RECURSIVE-EDIT arg of isearch-forward-regexp to t. (dired-isearch-filter-filenames): Remove unnecessary check for `dired-isearch-filenames'. * lisp/comint.el (comint-history-isearch-backward): Set NO-RECURSIVE-EDIT arg of isearch-backward to t. (comint-history-isearch-backward-regexp): Set NO-RECURSIVE-EDIT arg of isearch-backward-regexp to t. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-10 20:56:59 +0000 +++ lisp/ChangeLog 2013-12-11 00:11:26 +0000 @@ -1,3 +1,30 @@ +2013-12-11 Juri Linkov + + * misearch.el (multi-isearch-buffers): Set the value of + `multi-isearch-buffer-list' globally. Set NO-RECURSIVE-EDIT + arg of isearch-forward to t. + (multi-isearch-buffers-regexp): Set the value of + `multi-isearch-buffer-list' globally. Set NO-RECURSIVE-EDIT + arg of isearch-forward-regexp to t. + (multi-isearch-files): Set the value of + `multi-isearch-file-list' globally. Set NO-RECURSIVE-EDIT + arg of isearch-forward to t. + (multi-isearch-files-regexp): Set the value of + `multi-isearch-file-list globally. Set NO-RECURSIVE-EDIT + arg of isearch-forward-regexp to t. (Bug#16035) + + * dired-aux.el (dired-isearch-filenames): Set NO-RECURSIVE-EDIT + arg of isearch-forward to t. + (dired-isearch-filenames-regexp): Set NO-RECURSIVE-EDIT + arg of isearch-forward-regexp to t. + (dired-isearch-filter-filenames): Remove unnecessary check for + `dired-isearch-filenames'. + + * comint.el (comint-history-isearch-backward): + Set NO-RECURSIVE-EDIT arg of isearch-backward to t. + (comint-history-isearch-backward-regexp): + Set NO-RECURSIVE-EDIT arg of isearch-backward-regexp to t. + 2013-12-10 Eli Zaretskii * Makefile.in (autoloads): Run $(srcdir)/loaddefs.el through === modified file 'lisp/comint.el' --- lisp/comint.el 2013-11-30 08:42:28 +0000 +++ lisp/comint.el 2013-12-11 00:11:26 +0000 @@ -1407,13 +1407,13 @@ "Search for a string backward in input history using Isearch." (interactive) (let ((comint-history-isearch t)) - (isearch-backward))) + (isearch-backward nil t))) (defun comint-history-isearch-backward-regexp () "Search for a regular expression backward in input history using Isearch." (interactive) (let ((comint-history-isearch t)) - (isearch-backward-regexp))) + (isearch-backward-regexp nil t))) (defvar-local comint-history-isearch-message-overlay nil) === modified file 'lisp/dired-aux.el' --- lisp/dired-aux.el 2013-08-10 15:17:29 +0000 +++ lisp/dired-aux.el 2013-12-11 00:11:26 +0000 @@ -2526,24 +2526,22 @@ "Test whether the current search hit is a file name. Return non-nil if the text from BEG to END is part of a file name (has the text property `dired-filename')." - (if dired-isearch-filenames - (text-property-not-all (min beg end) (max beg end) - 'dired-filename nil) - t)) + (text-property-not-all (min beg end) (max beg end) + 'dired-filename nil)) ;;;###autoload (defun dired-isearch-filenames () "Search for a string using Isearch only in file names in the Dired buffer." (interactive) (let ((dired-isearch-filenames t)) - (isearch-forward))) + (isearch-forward nil t))) ;;;###autoload (defun dired-isearch-filenames-regexp () "Search for a regexp using Isearch only in file names in the Dired buffer." (interactive) (let ((dired-isearch-filenames t)) - (isearch-forward-regexp))) + (isearch-forward-regexp nil t))) ;; Functions for searching in tags style among marked files. === modified file 'lisp/dired.el' --- lisp/dired.el 2013-10-30 16:29:36 +0000 +++ lisp/dired.el 2013-12-11 00:11:26 +0000 @@ -3849,7 +3849,7 @@ ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "dired-aux" "dired-aux.el" "04b4cb6bde3220f55574eb1d99ac0d29") +;;;### (autoloads nil "dired-aux" "dired-aux.el" "4cb9d594789dacdf2445f338b9189357") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ === modified file 'lisp/misearch.el' --- lisp/misearch.el 2013-01-11 23:08:55 +0000 +++ lisp/misearch.el 2013-12-11 00:11:26 +0000 @@ -262,11 +262,11 @@ (multi-isearch-read-matching-buffers) (multi-isearch-read-buffers)))) (let ((multi-isearch-next-buffer-function - 'multi-isearch-next-buffer-from-list) - (multi-isearch-buffer-list (mapcar #'get-buffer buffers))) + 'multi-isearch-next-buffer-from-list)) + (setq multi-isearch-buffer-list (mapcar #'get-buffer buffers)) (switch-to-buffer (car multi-isearch-buffer-list)) (goto-char (if isearch-forward (point-min) (point-max))) - (isearch-forward))) + (isearch-forward nil t))) ;;;###autoload (defun multi-isearch-buffers-regexp (buffers) @@ -280,11 +280,11 @@ (multi-isearch-read-matching-buffers) (multi-isearch-read-buffers)))) (let ((multi-isearch-next-buffer-function - 'multi-isearch-next-buffer-from-list) - (multi-isearch-buffer-list (mapcar #'get-buffer buffers))) + 'multi-isearch-next-buffer-from-list)) + (setq multi-isearch-buffer-list (mapcar #'get-buffer buffers)) (switch-to-buffer (car multi-isearch-buffer-list)) (goto-char (if isearch-forward (point-min) (point-max))) - (isearch-forward-regexp))) + (isearch-forward-regexp nil t))) ;;; Global multi-file search invocations @@ -346,11 +346,11 @@ (multi-isearch-read-matching-files) (multi-isearch-read-files)))) (let ((multi-isearch-next-buffer-function - 'multi-isearch-next-file-buffer-from-list) - (multi-isearch-file-list (mapcar #'expand-file-name files))) + 'multi-isearch-next-file-buffer-from-list)) + (setq multi-isearch-file-list (mapcar #'expand-file-name files)) (find-file (car multi-isearch-file-list)) (goto-char (if isearch-forward (point-min) (point-max))) - (isearch-forward))) + (isearch-forward nil t))) ;;;###autoload (defun multi-isearch-files-regexp (files) @@ -365,11 +365,11 @@ (multi-isearch-read-matching-files) (multi-isearch-read-files)))) (let ((multi-isearch-next-buffer-function - 'multi-isearch-next-file-buffer-from-list) - (multi-isearch-file-list (mapcar #'expand-file-name files))) + 'multi-isearch-next-file-buffer-from-list)) + (setq multi-isearch-file-list (mapcar #'expand-file-name files)) (find-file (car multi-isearch-file-list)) (goto-char (if isearch-forward (point-min) (point-max))) - (isearch-forward-regexp))) + (isearch-forward-regexp nil t))) (provide 'multi-isearch) ------------------------------------------------------------ revno: 115448 fixes bug: http://debbugs.gnu.org/16099 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2013-12-10 22:56:59 +0200 message: Fix bug #16099 with failed out-of-tree builds on MS-Windows. lisp/Makefile.in (autoloads): Run $(srcdir)/loaddefs.el through unmsys--file-name. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-10 00:54:38 +0000 +++ lisp/ChangeLog 2013-12-10 20:56:59 +0000 @@ -1,3 +1,8 @@ +2013-12-10 Eli Zaretskii + + * Makefile.in (autoloads): Run $(srcdir)/loaddefs.el through + unmsys--file-name. (Bug#16099) + 2013-12-10 Teodor Zlatanov * emacs-lisp/package.el (package-keyword-button-action): Remove === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2013-11-30 02:06:34 +0000 +++ lisp/Makefile.in 2013-12-10 20:56:59 +0000 @@ -183,7 +183,7 @@ echo Directories: $$wins; \ $(emacs) -l autoload \ --eval '(setq autoload-builtin-package-versions t)' \ - --eval '(setq generated-autoload-file (expand-file-name "$(srcdir)/loaddefs.el"))' \ + --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \ -f batch-update-autoloads $$wins # This is required by the bootstrap-emacs target in ../src/Makefile, so ------------------------------------------------------------ revno: 115447 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2013-12-10 07:36:36 +0400 message: * font.c (font_find_for_lface): Ensure SAFE_FREE on return. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-10 02:32:52 +0000 +++ src/ChangeLog 2013-12-10 03:36:36 +0000 @@ -2,6 +2,7 @@ * xdisp.c (display_tool_bar_line): Don't extend on a previously drawn tool bar items (Bug#16058). + * font.c (font_find_for_lface): Ensure SAFE_FREE on return. 2013-12-09 Ken Brown === modified file 'src/font.c' --- src/font.c 2013-12-04 13:08:30 +0000 +++ src/font.c 2013-12-10 03:36:36 +0000 @@ -3209,7 +3209,10 @@ val = font_select_entity (f, entities, attrs, pixel_size, c); if (! NILP (val)) - return val; + { + SAFE_FREE (); + return val; + } } } }