Merge from trunk.
This commit is contained in:
Eli Zaretskii
commit
5bdc6977e3
10 changed files with 78 additions and 16 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2013-12-10 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* 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 <eliz@gnu.org>
|
||||
|
||||
* configure.ac (HAVE_RSVG) [mingw32]: Don't link against librsvg
|
||||
|
|
|
|||
|
|
@ -4697,7 +4697,6 @@ CFLAGS=$pre_PKG_CONFIG_CFLAGS
|
|||
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
|
||||
|
|
|
|||
|
|
@ -1,3 +1,16 @@
|
|||
2013-12-10 Teodor Zlatanov <tzz@lifelogs.com>
|
||||
|
||||
* emacs-lisp/package.el (package-keyword-button-action): Remove
|
||||
finder.el require dependency.
|
||||
|
||||
2013-12-09 Teodor Zlatanov <tzz@lifelogs.com>
|
||||
|
||||
* 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 <eliz@gnu.org>
|
||||
|
||||
* autorevert.el (auto-revert-notify-add-watch): Fix a thinko in
|
||||
|
|
|
|||
|
|
@ -1353,7 +1353,9 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
|
|||
(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 +1394,10 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
|
|||
(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 +1430,15 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
|
|||
(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 +1509,21 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
|
|||
(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)))
|
||||
|
||||
(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.
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,12 @@ 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:
|
||||
|
|
@ -29,7 +33,6 @@ AC_DEFUN([gl_CRYPTO_CHECK],
|
|||
ALG_header=sha.h
|
||||
fi
|
||||
|
||||
LIB_CRYPTO=
|
||||
AC_SUBST([LIB_CRYPTO])
|
||||
if test "x$with_openssl" != xno; then
|
||||
AC_CHECK_LIB([crypto], [$1],
|
||||
|
|
|
|||
|
|
@ -1,3 +1,16 @@
|
|||
2013-12-10 Dmitry Antipov <dmantipov@yandex.ru>
|
||||
|
||||
* 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 <kbrown@cornell.edu>
|
||||
|
||||
* 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 <dmantipov@yandex.ru>
|
||||
|
||||
* gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]:
|
||||
|
|
|
|||
|
|
@ -3209,7 +3209,10 @@ font_find_for_lface (struct frame *f, Lisp_Object *attrs, Lisp_Object spec, int
|
|||
val = font_select_entity (f, entities,
|
||||
attrs, pixel_size, c);
|
||||
if (! NILP (val))
|
||||
return val;
|
||||
{
|
||||
SAFE_FREE ();
|
||||
return val;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1929,7 +1929,7 @@ If there is no window system support, this function does nothing. */)
|
|||
/* 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
|
||||
|
|
|
|||
|
|
@ -4046,7 +4046,7 @@ extern void set_frame_param (struct frame *, Lisp_Object, Lisp_Object);
|
|||
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);
|
||||
|
|
|
|||
|
|
@ -11937,7 +11937,9 @@ display_tool_bar_line (struct it *it, int height)
|
|||
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,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue