[Emacs-diffs] emacs/lisp/url ChangeLog url-parse.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/27 01:27:05

Modified files:
        lisp/url       : ChangeLog url-parse.el 

Log message:
        (url-generic-parse-url): Bind deactivate-mark.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/ChangeLog?cvsroot=emacs&r1=1.187&r2=1.188
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-parse.el?cvsroot=emacs&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/ChangeLog,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- ChangeLog   8 Nov 2009 05:32:48 -0000       1.187
+++ ChangeLog   27 Nov 2009 01:27:04 -0000      1.188
@@ -1,3 +1,7 @@
+2009-11-27  Stefan Monnier  <address@hidden>
+
+       * url-parse.el (url-generic-parse-url): Bind deactivate-mark.
+
 2009-11-08  Kai Tetzlaff  <address@hidden>  (tiny change)
 
        * url-http.el (url-http-handle-authentication): Use proxy server,

Index: url-parse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-parse.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- url-parse.el        5 Jan 2009 03:24:20 -0000       1.22
+++ url-parse.el        27 Nov 2009 01:27:04 -0000      1.23
@@ -91,6 +91,9 @@
     (url-parse-make-urlobj nil nil nil nil nil url))
    (t
     (with-temp-buffer
+      ;; Don't let those temp-buffer modifications accidentally
+      ;; deactivate the mark of the current-buffer.
+      (let ((deactivate-mark nil))
       (set-syntax-table url-parse-syntax-table)
       (let ((save-pos nil)
            (prot nil)
@@ -109,17 +112,15 @@
        (setq save-pos (point))
 
        ;; 3.1. Scheme
-       (if (not (looking-at "//"))
-           (progn
+          (unless (looking-at "//")
              (skip-chars-forward "a-zA-Z+.\\-")
              (downcase-region save-pos (point))
              (setq prot (buffer-substring save-pos (point)))
              (skip-chars-forward ":")
-             (setq save-pos (point))))
+            (setq save-pos (point)))
 
        ;; 3.2. Authority
-       (if (looking-at "//")
-           (progn
+          (when (looking-at "//")
              (setq full t)
              (forward-char 2)
              (setq save-pos (point))
@@ -138,7 +139,7 @@
              (if (string-match ":$" host)
                  (setq host (substring host 0 (match-beginning 0))))
              (setq host (downcase host)
-                   save-pos (point))))
+                  save-pos (point)))
 
        (if (not port)
            (setq port (url-scheme-get-property prot 'default-port)))
@@ -162,15 +163,16 @@
               (point-max))))
          (goto-char save-pos)
          (skip-chars-forward "^;")
-         (if (not (eobp))
-             (setq attr (url-parse-args (buffer-substring (point) (point-max)) 
t)
+            (unless (eobp)
+              (setq attr (url-parse-args (buffer-substring (point) (point-max))
+                                         t)
                    attr (nreverse attr))))
 
        (setq file (buffer-substring save-pos (point)))
        (if (and host (string-match "%[0-9][0-9]" host))
            (setq host (url-unhex-string host)))
        (url-parse-make-urlobj
-         prot user pass host port file refs attr full))))))
+           prot user pass host port file refs attr full)))))))
 
 (provide 'url-parse)