------------------------------------------------------------ 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; + } } } } ------------------------------------------------------------ revno: 115446 committer: Paul Eggert branch nick: trunk timestamp: Mon 2013-12-09 18:44:28 -0800 message: * configure.ac: Disable libcrypto by default. Merge from gnulib, incorporating: 2013-12-07 md5, sha1, sha256, sha512: fix link error with partial lib * m4/gl-openssl.m4: Update from gnulib. diff: === modified file 'ChangeLog' --- ChangeLog 2013-12-08 19:28:29 +0000 +++ ChangeLog 2013-12-10 02:44:28 +0000 @@ -1,3 +1,11 @@ +2013-12-10 Paul Eggert + + * configure.ac: Disable libcrypto by default. + + Merge from gnulib, incorporating: + 2013-12-07 md5, sha1, sha256, sha512: fix link error with partial lib + * m4/gl-openssl.m4: Update from gnulib. + 2013-12-08 Eli Zaretskii * configure.ac (HAVE_RSVG) [mingw32]: Don't link against librsvg === modified file 'configure.ac' --- configure.ac 2013-12-08 19:28:29 +0000 +++ configure.ac 2013-12-10 02:44:28 +0000 @@ -4697,7 +4697,6 @@ LIBS="$LIB_PTHREAD $pre_PKG_CONFIG_LIBS" gl_ASSERT_NO_GNULIB_POSIXCHECK gl_ASSERT_NO_GNULIB_TESTS -gl_SET_CRYPTO_CHECK_DEFAULT([auto]) gl_INIT CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS === modified file 'm4/gl-openssl.m4' --- m4/gl-openssl.m4 2013-12-08 08:05:36 +0000 +++ m4/gl-openssl.m4 2013-12-10 02:44:28 +0000 @@ -12,8 +12,12 @@ 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: @@ -29,7 +33,6 @@ ALG_header=sha.h fi - LIB_CRYPTO= AC_SUBST([LIB_CRYPTO]) if test "x$with_openssl" != xno; then AC_CHECK_LIB([crypto], [$1], ------------------------------------------------------------ revno: 115445 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2013-12-10 06:32:52 +0400 message: * xdisp.c (display_tool_bar_line): Don't extend on a previously drawn tool bar items (Bug#16058). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-09 20:46:07 +0000 +++ src/ChangeLog 2013-12-10 02:32:52 +0000 @@ -1,3 +1,8 @@ +2013-12-10 Dmitry Antipov + + * xdisp.c (display_tool_bar_line): Don't extend on a previously + drawn tool bar items (Bug#16058). + 2013-12-09 Ken Brown * frame.c (get_frame_param): Make extern if HAVE_NTGUI. === modified file 'src/xdisp.c' --- src/xdisp.c 2013-12-04 18:46:47 +0000 +++ src/xdisp.c 2013-12-10 02:32:52 +0000 @@ -11937,7 +11937,9 @@ int max_x = it->last_visible_x; struct glyph *last; - prepare_desired_row (row); + /* Don't extend on a previously drawn tool bar items (Bug#16058). */ + clear_glyph_row (row); + row->enabled_p = 1; row->y = it->current_y; /* Note that this isn't made use of if the face hasn't a box, ------------------------------------------------------------ revno: 115444 committer: Ted Zlatanov branch nick: quickfixes timestamp: Mon 2013-12-09 19:54:38 -0500 message: Remove finder.el require dependency in package.el * emacs-lisp/package.el (package-keyword-button-action): Remove finder.el require dependency. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-09 21:35:26 +0000 +++ lisp/ChangeLog 2013-12-10 00:54:38 +0000 @@ -1,3 +1,8 @@ +2013-12-10 Teodor Zlatanov + + * emacs-lisp/package.el (package-keyword-button-action): Remove + finder.el require dependency. + 2013-12-09 Teodor Zlatanov * emacs-lisp/package.el: Require finder.el. === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2013-12-09 21:35:26 +0000 +++ lisp/emacs-lisp/package.el 2013-12-10 00:54:38 +0000 @@ -7,7 +7,7 @@ ;; Created: 10 Mar 2007 ;; Version: 1.0.1 ;; Keywords: tools -;; Package-Requires: ((tabulated-list "1.0") (finder)) +;; Package-Requires: ((tabulated-list "1.0")) ;; This file is part of GNU Emacs. @@ -166,7 +166,6 @@ (eval-when-compile (require 'cl-lib)) (require 'tabulated-list) -(require 'finder) (defgroup package nil "Manager for Emacs Lisp packages." @@ -1510,6 +1509,7 @@ (revert-buffer nil t) (goto-char (point-min))))) +(declare-function finder-list-matches "finder" (keyword)) (defun package-keyword-button-action (button) (let ((pkg-keyword (button-get button 'package-keyword))) (finder-list-matches pkg-keyword))) ------------------------------------------------------------ revno: 115443 committer: Ted Zlatanov branch nick: quickfixes timestamp: Mon 2013-12-09 16:35:26 -0500 message: Add keyword buttons to package description. * emacs-lisp/package.el: Require finder.el. (describe-package-1): Add keyword buttons. (package-make-button): New convenience function. (package-keyword-button-action): Keyword button action using `finder-list-matches' diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-09 17:48:01 +0000 +++ lisp/ChangeLog 2013-12-09 21:35:26 +0000 @@ -1,3 +1,11 @@ +2013-12-09 Teodor Zlatanov + + * emacs-lisp/package.el: Require finder.el. + (describe-package-1): Add keyword buttons. + (package-make-button): New convenience function. + (package-keyword-button-action): Keyword button action using + `finder-list-matches' + 2013-12-09 Eli Zaretskii * autorevert.el (auto-revert-notify-add-watch): Fix a thinko in === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2013-11-20 21:01:00 +0000 +++ lisp/emacs-lisp/package.el 2013-12-09 21:35:26 +0000 @@ -7,7 +7,7 @@ ;; Created: 10 Mar 2007 ;; Version: 1.0.1 ;; Keywords: tools -;; Package-Requires: ((tabulated-list "1.0")) +;; Package-Requires: ((tabulated-list "1.0") (finder)) ;; This file is part of GNU Emacs. @@ -166,6 +166,7 @@ (eval-when-compile (require 'cl-lib)) (require 'tabulated-list) +(require 'finder) (defgroup package nil "Manager for Emacs Lisp packages." @@ -1353,7 +1354,9 @@ (reqs (if desc (package-desc-reqs desc))) (version (if desc (package-desc-version desc))) (archive (if desc (package-desc-archive desc))) - (homepage (if desc (cdr (assoc :url (package-desc-extras desc))))) + (extras (and desc (package-desc-extras desc))) + (homepage (cdr (assoc :url extras))) + (keywords (cdr (assoc :keywords extras))) (built-in (eq pkg-dir 'builtin)) (installable (and archive (not built-in))) (status (if desc (package-desc-status desc) "orphan")) @@ -1392,15 +1395,10 @@ (insert (capitalize status)) (insert " from " (format "%s" archive)) (insert " -- ") - (let ((button-text (if (display-graphic-p) "Install" "[Install]")) - (button-face (if (display-graphic-p) - '(:box (:line-width 2 :color "dark grey") - :background "light grey" - :foreground "black") - 'link))) - (insert-text-button button-text 'face button-face 'follow-link t - 'package-desc desc - 'action 'package-install-button-action))) + (package-make-button + "Install" + 'action 'package-install-button-action + 'package-desc desc)) (t (insert (capitalize status) "."))) (insert "\n") (insert " " (propertize "Archive" 'font-lock-face 'bold) @@ -1433,6 +1431,15 @@ (insert " " (propertize "Homepage" 'font-lock-face 'bold) ": ") (help-insert-xref-button homepage 'help-url homepage) (insert "\n")) + (when keywords + (insert " " (propertize "Keywords" 'font-lock-face 'bold) ": ") + (dolist (k keywords) + (package-make-button + k + 'package-keyword k + 'action 'package-keyword-button-action) + (insert " ")) + (insert "\n")) (let* ((all-pkgs (append (cdr (assq name package-alist)) (cdr (assq name package-archive-contents)) (let ((bi (assq name package--builtins))) @@ -1503,6 +1510,20 @@ (revert-buffer nil t) (goto-char (point-min))))) +(defun package-keyword-button-action (button) + (let ((pkg-keyword (button-get button 'package-keyword))) + (finder-list-matches pkg-keyword))) + +(defun package-make-button (text &rest props) + (let ((button-text (if (display-graphic-p) text (concat "[" text "]"))) + (button-face (if (display-graphic-p) + '(:box (:line-width 2 :color "dark grey") + :background "light grey" + :foreground "black") + 'link))) + (apply 'insert-text-button button-text 'face button-face 'follow-link t + props))) + ;;;; Package menu mode. ------------------------------------------------------------ revno: 115442 committer: Ken Brown branch nick: trunk timestamp: Mon 2013-12-09 15:46:07 -0500 message: Fix declaration of get_frame_param for cygw32 build. * src/frame.c (get_frame_param): Make extern if HAVE_NTGUI. * src/lisp.h (get_frame_param): Adjust conditions for prototype declaration. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-09 16:30:52 +0000 +++ src/ChangeLog 2013-12-09 20:46:07 +0000 @@ -1,3 +1,10 @@ +2013-12-09 Ken Brown + + * frame.c (get_frame_param): Make extern if HAVE_NTGUI. + + * lisp.h (get_frame_param): Adjust conditions for prototype + declaration. + 2013-12-09 Dmitry Antipov * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]: === modified file 'src/frame.c' --- src/frame.c 2013-12-08 09:56:02 +0000 +++ src/frame.c 2013-12-09 20:46:07 +0000 @@ -1929,7 +1929,7 @@ /* Return the value of frame parameter PROP in frame FRAME. */ #ifdef HAVE_WINDOW_SYSTEM -#if !HAVE_NS && !defined (WINDOWSNT) +#if !HAVE_NS && !HAVE_NTGUI static #endif Lisp_Object === modified file 'src/lisp.h' --- src/lisp.h 2013-12-04 22:10:46 +0000 +++ src/lisp.h 2013-12-09 20:46:07 +0000 @@ -4046,7 +4046,7 @@ extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object); extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object); extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object); -#if HAVE_NS || defined WINDOWSNT +#if HAVE_NS || HAVE_NTGUI extern Lisp_Object get_frame_param (struct frame *, Lisp_Object); #endif extern void frames_discard_buffer (Lisp_Object); ------------------------------------------------------------ revno: 115441 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2013-12-09 19:48:01 +0200 message: Fix a thinko in last commit in autorevert.el. lisp/autorevert.el (auto-revert-notify-add-watch): Exclude symlinks from file notifications. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-09 14:47:00 +0000 +++ lisp/ChangeLog 2013-12-09 17:48:01 +0000 @@ -1,3 +1,8 @@ +2013-12-09 Eli Zaretskii + + * autorevert.el (auto-revert-notify-add-watch): Fix a thinko in + last commit. + 2013-12-09 Michael Albinus * autorevert.el (auto-revert-notify-add-watch): Do not handle === modified file 'lisp/autorevert.el' --- lisp/autorevert.el 2013-12-09 14:47:00 +0000 +++ lisp/autorevert.el 2013-12-09 17:48:01 +0000 @@ -508,7 +508,7 @@ ;; `auto-revert-use-notify' are non-nil. (when (or (string-match auto-revert-notify-exclude-dir-regexp (expand-file-name default-directory)) - (not (file-symlink-p buffer-file-name))) + (file-symlink-p buffer-file-name)) ;; Fallback to file checks. (set (make-local-variable 'auto-revert-use-notify) nil)) ------------------------------------------------------------ revno: 115440 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2013-12-09 20:30:52 +0400 message: * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]: Avoid unused macro warning if configured --without-xft. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-09 08:23:01 +0000 +++ src/ChangeLog 2013-12-09 16:30:52 +0000 @@ -1,3 +1,8 @@ +2013-12-09 Dmitry Antipov + + * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]: + Avoid unused macro warning if configured --without-xft. + 2013-12-09 Jan Djärv * alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always. === modified file 'src/gtkutil.c' --- src/gtkutil.c 2013-12-07 17:41:02 +0000 +++ src/gtkutil.c 2013-12-09 16:30:52 +0000 @@ -78,6 +78,7 @@ #define remove_submenu(w) gtk_menu_item_remove_submenu ((w)) #endif +#ifdef HAVE_FREETYPE #if GTK_CHECK_VERSION (3, 2, 0) #define USE_NEW_GTK_FONT_CHOOSER 1 #else @@ -89,6 +90,7 @@ #define gtk_font_chooser_set_font(x, y) \ gtk_font_selection_dialog_set_font_name (x, y) #endif +#endif /* HAVE_FREETYPE */ #ifndef HAVE_GTK3 #ifdef USE_GTK_TOOLTIP ------------------------------------------------------------ revno: 115439 committer: Michael Albinus branch nick: trunk timestamp: Mon 2013-12-09 15:47:00 +0100 message: * autorevert.el (auto-revert-notify-add-watch): Do not handle symlinked files. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-09 04:19:16 +0000 +++ lisp/ChangeLog 2013-12-09 14:47:00 +0000 @@ -1,3 +1,8 @@ +2013-12-09 Michael Albinus + + * autorevert.el (auto-revert-notify-add-watch): Do not handle + symlinked files. + 2013-12-09 Dmitry Gutov * progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Return t === modified file 'lisp/autorevert.el' --- lisp/autorevert.el 2013-09-12 04:56:51 +0000 +++ lisp/autorevert.el 2013-12-09 14:47:00 +0000 @@ -504,13 +504,15 @@ (defun auto-revert-notify-add-watch () "Enable file notification for current buffer's associated file." - (when (string-match auto-revert-notify-exclude-dir-regexp - (expand-file-name default-directory)) + ;; We can assume that `buffer-file-name' and + ;; `auto-revert-use-notify' are non-nil. + (when (or (string-match auto-revert-notify-exclude-dir-regexp + (expand-file-name default-directory)) + (not (file-symlink-p buffer-file-name))) ;; Fallback to file checks. (set (make-local-variable 'auto-revert-use-notify) nil)) - (when (and buffer-file-name auto-revert-use-notify - (not auto-revert-notify-watch-descriptor)) + (when (not auto-revert-notify-watch-descriptor) (setq auto-revert-notify-watch-descriptor (ignore-errors (file-notify-add-watch ------------------------------------------------------------ revno: 115438 committer: Jan Djärv branch nick: trunk timestamp: Mon 2013-12-09 09:23:01 +0100 message: * alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-12-08 12:59:14 +0000 +++ src/ChangeLog 2013-12-09 08:23:01 +0000 @@ -1,3 +1,7 @@ +2013-12-09 Jan Djärv + + * alloc.c (Fmemory_limit): Avoid compiler warning. Return 0 always. + 2013-12-08 Jan Djärv * nsterm.m (updateFrameSize:): Fix GNUStep toolbar not updating. === modified file 'src/alloc.c' --- src/alloc.c 2013-12-01 22:33:13 +0000 +++ src/alloc.c 2013-12-09 08:23:01 +0000 @@ -6633,7 +6633,12 @@ { Lisp_Object end; +#ifdef HAVE_NS + /* Avoid warning. sbrk has no relation to memory allocated anyway. */ + XSETINT (end, 0); +#else XSETINT (end, (intptr_t) (char *) sbrk (0) / 1024); +#endif return end; }