[Emacs-diffs] Changes to emacs/lisp/net/xesam.el,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       08/08/14 05:02:45

Index: xesam.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/xesam.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- xesam.el    10 Aug 2008 19:35:39 -0000      1.8
+++ xesam.el    14 Aug 2008 05:02:45 -0000      1.9
@@ -571,7 +571,8 @@
                         (widget-get widget :xesam:mimeType)))
       (widget-put
        widget :notify
-       '(lambda (widget &rest ignore)
+       (lambda (widget &rest ignore)
+        (save-excursion
          ;; We toggle.  If there are already children, we delete them.
          (if (widget-get widget :children)
              (widget-children-value-delete widget)
@@ -596,7 +597,7 @@
                ;; able to delete it next toggle.
                (widget-put
                 widget
-                :children (cons child (widget-get widget :children)))))))))
+                 :children (cons child (widget-get widget :children))))))))))
 
      ;; For local files, we will open the file as default action.
      ((string-match "file"
@@ -604,7 +605,7 @@
                               (widget-get widget :xesam:url))))
       (widget-put
        widget :notify
-       '(lambda (widget &rest ignore)
+       (lambda (widget &rest ignore)
          (find-file
           (url-filename (url-generic-parse-url (widget-value widget))))))
       (widget-put
@@ -676,7 +677,7 @@
              (widget-create
               'link
               :notify
-              '(lambda (widget &rest ignore)
+              (lambda (widget &rest ignore)
                  (setq xesam-to (+ xesam-to xesam-hits-per-page))
                  (widget-delete widget)
                  (xesam-refresh-search-buffer xesam-engine xesam-search))
@@ -690,13 +691,13 @@
               engine search
               (min xesam-hits-per-page
                    (- (min (+ xesam-hits-per-page xesam-to) xesam-count)
-                      (length xesam-objects))))))
+                      (length xesam-objects)))))
 
            ;; Add "DONE" widget.
            (when (= xesam-current xesam-count)
              (goto-char (point-max))
              (widget-create 'link :notify 'ignore "DONE")
-             (widget-beginning-of-line))
+             (widget-beginning-of-line)))
 
        ;; Return with save settings.
        (setq xesam-refreshing nil)))))
@@ -746,7 +747,7 @@
         (xml-string
          (format
           (if (eq type 'user-query) xesam-user-query xesam-fulltext-query)
-          query))
+          (url-insert-entities-in-string query)))
         (search (xesam-dbus-call-method
                  :session service xesam-path-search
                  xesam-interface-search "NewSearch" session xml-string)))
@@ -788,7 +789,7 @@
               (xesam-get-cached-property engine "vendor.id")
               'help-echo
               (mapconcat
-               '(lambda (x)
+               (lambda (x)
                   (format "%s: %s" x (xesam-get-cached-property engine x)))
                '("vendor.id" "vendor.version" "vendor.display" "vendor.xesam"
                  "vendor.ontology.fields" "vendor.ontology.contents"
@@ -820,7 +821,7 @@
   (xesam-search (car (xesam-search-engines)) \"emacs\")"
   (interactive
    (let* ((vendors (mapcar
-                   '(lambda (x) (xesam-get-cached-property x "vendor.display"))
+                   (lambda (x) (xesam-get-cached-property x "vendor.display"))
                    (xesam-search-engines)))
          (vendor
           (if (> (length vendors) 1)