[Emacs-diffs] scratch/gnus-cloud 07f3078 60/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Teodor Zlatanov]

branch: scratch/gnus-cloud
commit 07f3078f4abaac0394956d3e3c6deeae1bb809a2
Merge: fda47c9 af0d0b8
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/auth-source.el |   24 ++++++++++++------------
 lwlib/lwlib.c       |   12 +++++++-----
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index fe28a02..97059fa 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -1155,7 +1155,7 @@ FILE is the file from which we obtained this token."
                       (point-min)
                       (point-max))))))
 
-(defun auto-source--symbol-keyword (symbol)
+(defun auth-source--symbol-keyword (symbol)
   (intern (format ":%s" symbol)))
 
 (defun auth-source-netrc-normalize (alist filename)
@@ -1191,7 +1191,7 @@ FILE is the file from which we obtained this token."
                                   (setq lexv (funcall token-decoder lexv)))
                                 lexv))))
                   (setq ret (plist-put ret
-                                       (auto-source--symbol-keyword k)
+                                       (auth-source--symbol-keyword k)
                                        v))))
               ret))
           alist))
@@ -1268,7 +1268,7 @@ See `auth-source-search' for details on SPEC."
     ;; fill in the valist with whatever data we may have from the search
     ;; we complete the first value if it's a list and use the value otherwise
     (dolist (br base-required)
-      (let ((val (plist-get spec (auto-source--symbol-keyword br))))
+      (let ((val (plist-get spec (auth-source--symbol-keyword br))))
         (when val
           (let ((br-choice (cond
                             ;; all-accepting choice (predicate is t)
@@ -1280,7 +1280,7 @@ See `auth-source-search' for details on SPEC."
 
     ;; for extra required elements, see if the spec includes a value for them
     (dolist (er create-extra)
-      (let ((k (auto-source--symbol-keyword er))
+      (let ((k (auth-source--symbol-keyword er))
             (keys (loop for i below (length spec) by 2
                         collect (nth i spec))))
         (when (memq k keys)
@@ -1292,7 +1292,7 @@ See `auth-source-search' for details on SPEC."
              ;; take the first element if the data is a list
              (data (or (auth-source-netrc-element-or-first data)
                        (plist-get current-data
-                                  (auto-source--symbol-keyword r))))
+                                  (auth-source--symbol-keyword r))))
              ;; this is the default to be offered
              (given-default (auth-source--aget
                              auth-source-creation-defaults r))
@@ -1382,7 +1382,7 @@ See `auth-source-search' for details on SPEC."
 
         (when data
           (setq artificial (plist-put artificial
-                                      (auto-source--symbol-keyword r)
+                                      (auth-source--symbol-keyword r)
                                       (if (eq r 'secret)
                                           (lexical-let ((data data))
                                             (lambda () data))
@@ -1840,7 +1840,7 @@ entries for git.gnus.org:
 
 (defun auth-source-macos-keychain-result-append (result generic k v)
   (push v result)
-  (push (auto-source--symbol-keyword
+  (push (auth-source--symbol-keyword
          (cond
           ((equal k "acct") "user")
           ;; for generic keychains, creator is host, service is port
@@ -1957,7 +1957,7 @@ entries for git.gnus.org:
     ;; fill in the valist with whatever data we may have from the search
     ;; we complete the first value if it's a list and use the value otherwise
     (dolist (br base-required)
-      (let ((val (plist-get spec (auto-source--symbol-keyword br))))
+      (let ((val (plist-get spec (auth-source--symbol-keyword br))))
         (when val
           (let ((br-choice (cond
                             ;; all-accepting choice (predicate is t)
@@ -1969,7 +1969,7 @@ entries for git.gnus.org:
 
     ;; for extra required elements, see if the spec includes a value for them
     (dolist (er create-extra)
-      (let ((k (auto-source--symbol-keyword er))
+      (let ((k (auth-source--symbol-keyword er))
             (keys (loop for i below (length spec) by 2
                         collect (nth i spec))))
         (when (memq k keys)
@@ -1981,7 +1981,7 @@ entries for git.gnus.org:
              ;; take the first element if the data is a list
              (data (or (auth-source-netrc-element-or-first data)
                        (plist-get current-data
-                                  (auto-source--symbol-keyword r))))
+                                  (auth-source--symbol-keyword r))))
              ;; this is the default to be offered
              (given-default (auth-source--aget
                              auth-source-creation-defaults r))
@@ -2041,10 +2041,10 @@ entries for git.gnus.org:
           (if (member r base-secret)
               (setq secret-artificial
                     (plist-put secret-artificial
-                               (auto-source--symbol-keyword r)
+                               (auth-source--symbol-keyword r)
                                data))
             (setq artificial (plist-put artificial
-                                        (auto-source--symbol-keyword r)
+                                        (auth-source--symbol-keyword r)
                                         data))))))
     (plstore-put (oref backend data)
                  (sha1 (format "address@hidden:%s"
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index c68cf77..d1c5195 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1042,11 +1042,13 @@ widget_value*
 lw_get_all_values (LWLIB_ID id)
 {
   widget_info* info = get_widget_info (id, False);
-  widget_value* val = info->val;
-  if (lw_get_some_values (id, val))
-    return val;
-  else
-    return NULL;
+  if (info)
+    {
+      widget_value* val = info->val;
+      if (lw_get_some_values (id, val))
+       return val;
+    }
+  return NULL;
 }
 
 /* internal function used by the library dependent implementation to get the