10 files changed, 137 insertions, 34 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d4566a91a6..7eef2c80382 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,34 @@
+2013-01-11  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (top): Require 'cl in order to pacify byte compiler.
+        (auto-revert-notify-rm-watch): Ignore errors.
+        (auto-revert-notify-add-watch): Ignore errors.  Use '(modify) for
+        inotify, and '(size last-write-time) for w32notify.  Set
+        buffer-local `auto-revert-use-notify' to nil when adding a file
+        watch fails - this is a fallback to the file modification check.
+        (auto-revert-notify-event-p, auto-revert-notify-event-descriptor)
+        (auto-revert-notify-event-action)
+        (auto-revert-notify-event-file-name): New defuns.
+        (auto-revert-notify-handler): Use them.  Implement first
+        plausibility checks.
+        (auto-revert-handler): Handle also `auto-revert-tail-mode'.
+
+2013-01-11  Julien Danjou  <julien@danjou.info>
+
+        * color.el (color-rgb-to-hsv): Fix conversion computing in case min and
+        max are almost equal. Also return the correct value for V which is
+        already between 0 and 1.
+
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * emacs-lisp/ert.el (ert-run-test): Use point-max-marker.
+
+2013-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * autorevert.el (auto-revert-notify-rm-watch)
+        (auto-revert-notify-add-watch): Fix typos in w32notify function
+        names.
+
 2013-01-10  Michael Albinus  <michael.albinus@gmx.de>
 
         * autorevert.el (auto-revert-notify-enabled): Move up.
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 4434ed21169..e78cecf0cc2 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -97,6 +97,7 @@
 
 ;; Dependencies:
 
+(eval-when-compile (require 'cl))
 (require 'timer)
 
 ;; Custom Group:
@@ -466,8 +467,10 @@ will use an up-to-date value of `auto-revert-interval'"
 (defun auto-revert-notify-rm-watch ()
   "Disable file watch for current buffer's associated file."
   (when auto-revert-notify-watch-descriptor
-    (funcall (if (fboundp 'inotify-rm-watch) 'inotify-rm-watch 'w32-rm-watch)
-             auto-revert-notify-watch-descriptor)
+    (ignore-errors
+      (funcall (if (fboundp 'inotify-rm-watch)
+                   'inotify-rm-watch 'w32notify-rm-watch)
+               auto-revert-notify-watch-descriptor))
     (remhash auto-revert-notify-watch-descriptor
              auto-revert-notify-watch-descriptor-hash-list))
   (setq auto-revert-notify-watch-descriptor nil
@@ -478,21 +481,62 @@ will use an up-to-date value of `auto-revert-interval'"
   (when (and buffer-file-name auto-revert-use-notify)
     (auto-revert-notify-rm-watch)
     (let ((func (if (fboundp 'inotify-add-watch)
-                    'inotify-add-watch 'w32-add-watch))
+                    'inotify-add-watch 'w32notify-add-watch))
           (aspect (if (fboundp 'inotify-add-watch)
-                      '(close-write) '(last-write-time))))
+                      '(modify) '(size last-write-time))))
       (setq auto-revert-notify-watch-descriptor
-            (funcall func buffer-file-name aspect 'auto-revert-notify-handler))
-      (puthash auto-revert-notify-watch-descriptor
-               (current-buffer)
-               auto-revert-notify-watch-descriptor-hash-list))))
+            (ignore-errors
+              (funcall
+               func buffer-file-name aspect 'auto-revert-notify-handler)))
+      (if auto-revert-notify-watch-descriptor
+          (puthash auto-revert-notify-watch-descriptor
+                   (current-buffer)
+                   auto-revert-notify-watch-descriptor-hash-list)
+        ;; Fallback to file checks.
+        (set (make-local-variable 'auto-revert-use-notify) nil)))))
+
+(defun auto-revert-notify-event-p (event)
+  "Check that event is a file watch event."
+  (cond ((featurep 'inotify)
+         (and (listp event) (= (length event) 4)))
+        ((featurep 'w32notify)
+         (and (listp event) (= (length event) 3) (stringp (nth 2 event))))))
+
+(defun auto-revert-notify-event-descriptor (event)
+  "Return watch descriptor of notification event, or nil."
+  (and (auto-revert-notify-event-p event) (car event)))
+
+(defun auto-revert-notify-event-action (event)
+  "Return action of notification event, or nil."
+  (and (auto-revert-notify-event-p event) (nth 1 event)))
+
+(defun auto-revert-notify-event-file-name (event)
+  "Return file name of notification event, or nil."
+  (and (auto-revert-notify-event-p event)
+       (cond ((featurep 'inotify) (nth 3 event))
+             ((featurep 'w32notify) (nth 2 event)))))
 
 (defun auto-revert-notify-handler (event)
   "Handle an event returned from file watch."
-  (when (listp event)
-    (let ((buffer
-           (gethash (car event) auto-revert-notify-watch-descriptor-hash-list)))
-      (when (bufferp buffer)
+  (when (auto-revert-notify-event-p event)
+    (let* ((descriptor (auto-revert-notify-event-descriptor event))
+           (action (auto-revert-notify-event-action event))
+           (file (auto-revert-notify-event-file-name event))
+           (buffer (gethash descriptor
+                            auto-revert-notify-watch-descriptor-hash-list)))
+      (ignore-errors
+        ;; Check, that event is meant for us.
+        ;; TODO: Filter events which stop watching, like `move' or `removed'.
+        (assert descriptor)
+        (when (featurep 'inotify) (assert (memq 'modify descriptor)))
+        (when (featurep 'w32notify) (assert (eq 'modified descriptor)))
+        (assert (bufferp buffer))
+        (when (stringp file)
+          (assert (string-equal
+                   (directory-file-name file)
+                   (directory-file-name (buffer-file-name buffer)))))
+
+        ;; Mark buffer modified.
         (with-current-buffer buffer
           (setq auto-revert-notify-modified-p t))))))
 
@@ -513,6 +557,8 @@ This is an internal function used by Auto-Revert Mode."
     (let* ((buffer (current-buffer)) size
            (revert
             (or (and buffer-file-name
+                     (or (not auto-revert-use-notify)
+                         auto-revert-notify-modified-p)
                      (if auto-revert-tail-mode
                          ;; Tramp caches the file attributes.  Setting
                          ;; `remote-file-name-inhibit-cache' forces Tramp
@@ -523,12 +569,9 @@ This is an internal function used by Auto-Revert Mode."
                                     (setq size
                                           (nth 7 (file-attributes
                                                   buffer-file-name))))))
-                       (if auto-revert-use-notify
-                           ;; There are file watches.
-                           auto-revert-notify-modified-p
-                         (and (not (file-remote-p buffer-file-name))
-                              (file-readable-p buffer-file-name)
-                              (not (verify-visited-file-modtime buffer))))))
+                       (and (not (file-remote-p buffer-file-name))
+                            (file-readable-p buffer-file-name)
+                            (not (verify-visited-file-modtime buffer)))))
                 (and (or auto-revert-mode
                          global-auto-revert-non-file-buffers)
                      revert-buffer-function
diff --git a/lisp/color.el b/lisp/color.el
index 63326e7c5b3..50f6675bf4b 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -130,7 +130,7 @@ inclusive."
          (max (max r g b))
          (min (min r g b)))
     (if (< (- max min) 1e-8)
-        (list 0.0 0.0 0.0)
+        (list 0.0 0.0 min)
       (list
        (/ (* 2 float-pi
              (cond ((and (= r g) (= g b)) 0)
@@ -146,7 +146,7 @@ inclusive."
                     (+ 240 (* 60 (/ (- r g) (- max min)))))))
           360)
        (if (= max 0) 0 (- 1 (/ min max)))
-       (/ max 255.0)))))
+       max))))
 
 (defun color-rgb-to-hsl (red green blue)
   "Convert RGB colors to their HSL representation.
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 70d6a6a4a5f..dd849362228 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -937,7 +937,7 @@ Returns the result and stores it in ERT-TEST's `most-recent-result' slot."
   (cl-block error
     (let ((begin-marker
            (with-current-buffer (get-buffer-create "*Messages*")
-             (set-marker (make-marker) (point-max)))))
+             (point-max-marker))))
       (unwind-protect
           (let ((info (make-ert--test-execution-info
                        :test ert-test
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3a625eb215e..bbe551c735d 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * erc-dcc.el (erc-dcc-send-file): Use point-min-marker.
+        (erc-dcc-chat-setup): Use point-max-marker.
+
 2013-01-04  Glenn Morris  <rgm@gnu.org>
 
         * erc-backend.el (312): Fix typo.  (Bug#13235)
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index dc67d3b01df..c27bb629f9d 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -897,7 +897,7 @@ other client."
       (let* ((buffer (erc-dcc-find-file file))
              (size (buffer-size buffer))
              (start (with-current-buffer buffer
-                      (set-marker (make-marker) (point-min))))
+                      (point-min-marker)))
              (sproc (erc-dcc-server "dcc-send"
                                     'erc-dcc-send-filter
                                     'erc-dcc-send-sentinel))
@@ -1166,7 +1166,7 @@ other client."
     (setq erc-dcc-from nick)
     (setq erc-dcc-entry-data entry)
     (setq erc-dcc-unprocessed-output "")
-    (setq erc-insert-marker (set-marker (make-marker) (point-max)))
+    (setq erc-insert-marker (point-max-marker))
     (setq erc-input-marker (make-marker))
     (erc-display-prompt buffer (point-max))
     (set-process-buffer proc buffer)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index dd93c7b22fe..0cea790792f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,15 @@
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * gnus-art.el (gnus-mime-display-security): Use point-min-marker
+        and point-max-marker.
+        * gnus-async.el (gnus-async-article-callback): Use point-max-marker.
+
+2013-01-10  Uwe Brauer  <oub@mat.ucm.es>  (tiny change)
+
+        * mml-smime.el (mml-smime-encrypt-to-self): New user option analogous
+        to mml2015-encrypt-to-self.
+        (mml-smime-epg-encrypt): Respect mml-smime-encrypt-to-self.
+
 2013-01-09  Daiki Ueno  <ueno@gnu.org>
 
         * mml-smime.el (epg-sub-key-fingerprint): Autoload for
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 1b4cddc5009..25a555f3d8b 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -8688,9 +8688,7 @@ For example:
              gnus-mime-security-button-end-line-format))
         (gnus-insert-mime-security-button handle)))
     (mm-set-handle-multipart-parameter
-     handle 'gnus-region
-     (cons (set-marker (make-marker) (point-min))
-           (set-marker (make-marker) (point-max))))
+     handle 'gnus-region (cons (point-min-marker) (point-max-marker)))
     (goto-char (point-max))))
 
 (defun gnus-mime-security-run-function (function)
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index 41b0cc25006..c5d64332547 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -254,7 +254,7 @@ that was fetched."
          gnus-async-article-alist
          (cons (list (intern (format "%s-%d" group article)
                              gnus-async-hashtb)
-                     mark (set-marker (make-marker) (point-max))
+                     mark (point-max-marker)
                      group article)
                gnus-async-article-alist))))
     (if (not (gnus-buffer-live-p summary))
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index e5e99dedcbe..6ea55377e02 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -80,6 +80,12 @@ Whether the passphrase is cached at all is controlled by
   :version "24.4"
   :type 'boolean)
 
+(defcustom mml-smime-encrypt-to-self nil
+  "If t, add your own key ID to recipient list when encryption."
+  :group 'mime-security
+  :version "24.4"
+  :type 'boolean)
+
 (defun mml-smime-sign (cont)
   (let ((func (nth 1 (assq mml-smime-use mml-smime-function-alist))))
     (if func
@@ -475,13 +481,17 @@ Content-Disposition: attachment; filename=smime.p7s
     (goto-char (point-max))))
 
 (defun mml-smime-epg-encrypt (cont)
-  (let ((inhibit-redisplay t)
-        (context (epg-make-context 'CMS))
-        (config (epg-configuration))
-        (recipients (message-options-get 'mml-smime-epg-recipients))
-        cipher signers
-        (boundary (mml-compute-boundary cont))
-        recipient-key)
+  (let* ((inhibit-redisplay t)
+         (context (epg-make-context 'CMS))
+         (config (epg-configuration))
+         (recipients (message-options-get 'mml-smime-epg-recipients))
+         cipher signers
+         (sender (message-options-get 'message-sender))
+         (signer-names (or mml-smime-signers
+                           (if (and mml-smime-sign-with-sender sender)
+                               (list (concat "<" sender ">")))))
+         (boundary (mml-compute-boundary cont))
+         recipient-key)
     (unless recipients
       (setq recipients
             (apply #'nconc
@@ -494,6 +504,10 @@ Content-Disposition: attachment; filename=smime.p7s
                          (message-options-set 'message-recipients
                                               (read-string "Recipients: ")))
                      "[ \f\t\n\r\v,]+"))))
+      (when mml-smime-encrypt-to-self
+        (unless signer-names
+          (error "Neither message sender nor mml-smime-signers are set"))
+        (setq recipients (nconc recipients signer-names)))
       (if (eq mm-encrypt-option 'guided)
           (setq recipients
                 (epa-select-keys context "\