Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99667. ------------------------------------------------------------ revno: 99667 committer: Michael Albinus branch nick: trunk timestamp: Tue 2010-03-16 00:27:31 +0100 message: * net/secrets.el (top): Register the D-Bus signals only when the service "org.freedesktop.secrets" can be pinged. Provide subfeature 'enabled. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-14 21:28:52 +0000 +++ lisp/ChangeLog 2010-03-15 23:27:31 +0000 @@ -1,3 +1,9 @@ +2010-03-15 Michael Albinus + + * net/secrets.el (top): Register the D-Bus signals only when the + service "org.freedesktop.secrets" can be pinged. Provide + subfeature 'enabled. + 2010-03-14 Juri Linkov Add finder unknown keywords. === modified file 'lisp/net/secrets.el' --- lisp/net/secrets.el 2010-03-13 20:33:54 +0000 +++ lisp/net/secrets.el 2010-03-15 23:27:31 +0000 @@ -32,9 +32,14 @@ ;; In order to activate this package, you must add the following code ;; into your .emacs: - +;; ;; (require 'secrets) +;; It can be checked afterwards, whether there is a daemon providing +;; this interface: +;; +;; (featurep 'secrets 'enabled) + ;; The atomic objects to be managed by the Secret Service API are ;; secret items, which are something an application wishes to store ;; securely. A good example is a password that an application needs @@ -383,14 +388,6 @@ (setq secrets-collection-paths (delete (car args) secrets-collection-paths))))) -(dbus-register-signal - :session secrets-service secrets-path - secrets-interface-service "CollectionCreated" 'secrets-collection-handler) - -(dbus-register-signal - :session secrets-service secrets-path - secrets-interface-service "CollectionDeleted" 'secrets-collection-handler) - (defun secrets-get-collections () "Return the object paths of all available collections." (setq secrets-collection-paths @@ -667,20 +664,38 @@ :session secrets-service item-path secrets-interface-item "Delete"))))) -;; We must reset all variables, when there is a new instance of the -;; "org.freedesktop.secrets" service. - -(dbus-register-signal - :session dbus-service-dbus dbus-path-dbus - dbus-interface-dbus "NameOwnerChanged" - (lambda (&rest args) - (when secrets-debug (message "Secret Service has changed: %S" args)) - (setq secrets-session-path secrets-empty-path - secrets-prompt-signal nil - secrets-collection-paths nil)) - secrets-service) - -(provide 'secrets) +(if (dbus-ping :session secrets-service 100) + + (progn + ;; We must reset all variables, when there is a new instance of + ;; the "org.freedesktop.secrets" service. + (dbus-register-signal + :session dbus-service-dbus dbus-path-dbus + dbus-interface-dbus "NameOwnerChanged" + (lambda (&rest args) + (when secrets-debug (message "Secret Service has changed: %S" args)) + (setq secrets-session-path secrets-empty-path + secrets-prompt-signal nil + secrets-collection-paths nil)) + secrets-service) + + ;; We want to refresh our cache, when there is a change in + ;; collections. + (dbus-register-signal + :session secrets-service secrets-path + secrets-interface-service "CollectionCreated" + 'secrets-collection-handler) + + (dbus-register-signal + :session secrets-service secrets-path + secrets-interface-service "CollectionDeleted" + 'secrets-collection-handler) + + ;; We shall inform, whether the secret service is enabled on + ;; this machine. + (provide 'secrets '(enabled))) + + (provide 'secrets)) ;;; TODO: ------------------------------------------------------------ revno: 99666 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-03-15 13:16:46 -0400 message: Put non-GTK X scroll-bars on left. * xfns.c (Fx_create_frame): * frame.c (Vdefault_frame_scroll_bars): Put non-GTK X scroll-bars on left. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-03-13 20:33:54 +0000 +++ etc/NEWS 2010-03-15 17:16:46 +0000 @@ -30,7 +30,7 @@ * Changes in Emacs 24.1 -** The scroll-bar is now on the right on GNU/Linux and UNIX-like systems. +** GTK scroll-bars are now placed on the right by default. Use `set-scroll-bar-mode' to change this. === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-13 19:54:29 +0000 +++ src/ChangeLog 2010-03-15 17:16:46 +0000 @@ -1,3 +1,9 @@ +2010-03-15 Chong Yidong + + * xfns.c (Fx_create_frame): + * frame.c (Vdefault_frame_scroll_bars): Put non-GTK X scroll-bars + on left. + 2010-03-13 Andreas Politz (tiny change) * editfns.c (Fformat): Account for string precision when computing === modified file 'src/frame.c' --- src/frame.c 2010-03-12 17:32:30 +0000 +++ src/frame.c 2010-03-15 17:16:46 +0000 @@ -4584,8 +4584,14 @@ DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars, doc: /* Default position of scroll bars on this window-system. */); #ifdef HAVE_WINDOW_SYSTEM +#if defined(HAVE_NTGUI) || defined(NS_IMPL_COCOA) || (defined(USE_GTK) && defined(USE_TOOLKIT_SCROLL_BARS)) + /* MS-Windows, Mac OS X, and GTK have scroll bars on the right by + default. */ Vdefault_frame_scroll_bars = Qright; #else + Vdefault_frame_scroll_bars = Qleft; +#endif +#else Vdefault_frame_scroll_bars = Qnil; #endif === modified file 'src/xfns.c' --- src/xfns.c 2010-03-12 23:13:02 +0000 +++ src/xfns.c 2010-03-15 17:16:46 +0000 @@ -3376,7 +3376,12 @@ #endif "internalBorderWidth", "internalBorderWidth", RES_TYPE_NUMBER); - x_default_parameter (f, parms, Qvertical_scroll_bars, Qright, + x_default_parameter (f, parms, Qvertical_scroll_bars, +#if defined(USE_GTK) && defined(USE_TOOLKIT_SCROLL_BARS) + Qright, +#else + Qleft, +#endif "verticalScrollBars", "ScrollBars", RES_TYPE_SYMBOL); ------------------------------------------------------------ revno: 99665 [merge] committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2010-03-15 01:39:53 +0000 message: (mm-charset-to-coding-system): Use coding-system-from-name if it is available. (bug#5647) diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-02-26 04:45:41 +0000 +++ lisp/gnus/ChangeLog 2010-03-15 01:38:28 +0000 @@ -1,3 +1,8 @@ +2010-03-15 Katsumi Yamaoka + + * mm-util.el (mm-charset-to-coding-system): Use coding-system-from-name + if it is available. (bug#5647) + 2010-02-26 Glenn Morris * message.el (message-send-mail-function): Change the default, so that === modified file 'lisp/gnus/mm-util.el' --- lisp/gnus/mm-util.el 2010-01-13 08:35:10 +0000 +++ lisp/gnus/mm-util.el 2010-03-15 01:38:28 +0000 @@ -566,6 +566,9 @@ ;;; (eq charset (coding-system-get charset 'mime-charset)) ) charset) + ;; Use coding system Emacs knows. + ((and (fboundp 'coding-system-from-name) + (coding-system-from-name charset))) ;; Eval expressions from `mm-charset-eval-alist' ((let* ((el (assq charset mm-charset-eval-alist)) (cs (car el)) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.