Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99669. ------------------------------------------------------------ revno: 99669 [merge] committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-03-17 02:53:43 +0000 message: (mml-read-tag): Unquote values with `read' to reverse prin1 in mml-insert-tag (just stripping the quotes gave wrong value if any backslash escapes). From Kevin Ryde . diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-03-15 01:38:28 +0000 +++ lisp/gnus/ChangeLog 2010-03-17 02:51:21 +0000 @@ -1,3 +1,9 @@ +2010-03-17 Kevin Ryde + + * mml.el (mml-read-tag): Unquote values with `read' to reverse + prin1 in mml-insert-tag (just stripping the quotes gave wrong + value if any backslash escapes). + 2010-03-15 Katsumi Yamaoka * mm-util.el (mm-charset-to-coding-system): Use coding-system-from-name === modified file 'lisp/gnus/mml.el' --- lisp/gnus/mml.el 2010-01-13 08:35:10 +0000 +++ lisp/gnus/mml.el 2010-03-17 02:51:21 +0000 @@ -392,8 +392,8 @@ (skip-chars-forward "= \t\n") (setq val (buffer-substring-no-properties (point) (progn (forward-sexp 1) (point)))) - (when (string-match "^\"\\(.*\\)\"$" val) - (setq val (match-string 1 val))) + (when (string-match "\\`\"" val) + (setq val (read val))) ;; inverse of prin1 in mml-insert-tag (push (cons (intern elem) val) contents) (skip-chars-forward " \t\n")) (goto-char (match-end 0)) ------------------------------------------------------------ revno: 99668 committer: Michael Albinus branch nick: trunk timestamp: Tue 2010-03-16 17:45:07 +0100 message: * net/secrets.el (secrets-enabled): New variable. Use it instead of a subfeature. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-15 23:27:31 +0000 +++ lisp/ChangeLog 2010-03-16 16:45:07 +0000 @@ -1,3 +1,8 @@ +2010-03-16 Michael Albinus + + * net/secrets.el (secrets-enabled): New variable. Use it instead + of a subfeature. + 2010-03-15 Michael Albinus * net/secrets.el (top): Register the D-Bus signals only when the === modified file 'lisp/net/secrets.el' --- lisp/net/secrets.el 2010-03-15 23:27:31 +0000 +++ lisp/net/secrets.el 2010-03-16 16:45:07 +0000 @@ -34,11 +34,9 @@ ;; into your .emacs: ;; ;; (require 'secrets) - -;; It can be checked afterwards, whether there is a daemon providing -;; this interface: ;; -;; (featurep 'secrets 'enabled) +;; Afterwards, the variable `secrets-enabled' is non-nil when there is +;; a daemon providing this interface. ;; The atomic objects to be managed by the Secret Service API are ;; secret items, which are something an application wishes to store @@ -150,6 +148,9 @@ (require 'dbus) +(defvar secrets-enabled nil + "Whether there is a daemon offering the Secret Service API." + (defvar secrets-debug t "Write debug messages") @@ -664,38 +665,37 @@ :session secrets-service item-path secrets-interface-item "Delete"))))) -(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)) +(when (dbus-ping :session secrets-service 100) + + ;; 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. + (setq secrets-enabled t))) + +(provide 'secrets) ;;; TODO: ------------------------------------------------------------ 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: ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.