[elpa] master d9d04d1: Fix byte compile warning and some customizations
branch: master commit d9d04d151c636b4836d3789c445dc3cdf95621d4 Author: Martin Rudalics Commit: Martin Rudalics Fix byte compile warning and some customizations * packages/frame-tabs/frame-tabs.el (frame-tabs-mode): New variable to silence byte compiler. (frame-tabs--set-value): Don't turn on 'frame-tabs-mode' unless it's already on. (frame-tabs-min-size, frame-tabs-max-size, frame-tabs-delay): Set value via 'frame-tabs--set-value'. --- packages/frame-tabs/frame-tabs.el | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/frame-tabs/frame-tabs.el b/packages/frame-tabs/frame-tabs.el index 5b3471f..6f1e8ac 100644 --- a/packages/frame-tabs/frame-tabs.el +++ b/packages/frame-tabs/frame-tabs.el @@ -94,12 +94,14 @@ button." :group 'frame-tabs) ;; Options +(defvar frame-tabs-mode) + (defun frame-tabs--set-value (symbol value) "Helper function for customizing frame tabs." (set-default symbol value) (when frame-tabs-mode -(frame-tabs-mode -1)) - (frame-tabs-mode 1)) +(frame-tabs-mode -1) +(frame-tabs-mode 1))) (defcustom frame-tabs-side 'top "Side of frame where tabs windows are located. @@ -132,6 +134,8 @@ of a frame this is their minimum number of columns. This value may be overridden when the major side window showing the frame tabs window contains other windows." :type 'integer + :initialize 'custom-initialize-default + :set 'frame-tabs--set-value :version "26.1" :group 'frame-tabs) @@ -144,6 +148,8 @@ of a frame this is their maximum number of columns. This value may be overridden when the major side window showing the frame tabs window contains other windows." :type 'integer + :initialize 'custom-initialize-default + :set 'frame-tabs--set-value :version "26.1" :group 'frame-tabs) @@ -151,6 +157,8 @@ the frame tabs window contains other windows." "Frame tabs update interval, in seconds. This is the time Emacs waits before updating frame tabs windows." :type 'float + :initialize 'custom-initialize-default + :set 'frame-tabs--set-value :version "26.1" :group 'frame-tabs)
[elpa] externals/ebdb 9218d7c 4/4: Bump to 0.5.4
branch: externals/ebdb commit 9218d7c45fffc5676e22a7cd07221d8045853d30 Author: Eric Abrahamsen Commit: Eric Abrahamsen Bump to 0.5.4 --- ebdb.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebdb.el b/ebdb.el index dcb6d26..84ad862 100644 --- a/ebdb.el +++ b/ebdb.el @@ -2,7 +2,7 @@ ;; Copyright (C) 2016-2018 Free Software Foundation, Inc. -;; Version: 0.5.3 +;; Version: 0.5.4 ;; Package-Requires: ((emacs "25.1") (cl-lib "0.5") (seq "2.15")) ;; Maintainer: Eric Abrahamsen
[elpa] externals/ebdb a84affc 3/4: Replace eieio-object-name-string with ebdb-field-label
branch: externals/ebdb commit a84affcaa407d6ec65a15bb37622db298503902c Author: Eric Abrahamsen Commit: Eric Abrahamsen Replace eieio-object-name-string with ebdb-field-label * ebdb.el (ebdb-field-label): Now that we're not using `eieio-named', we shouldn't be using this method. Replace it with a custom method. * ebdb-com.el (ebdb-fmt-field-label, ebdb-copy-fields-as-kill): Change calls. * ebdb-format.el (ebdb-fmt-field): Change calls. --- ebdb-com.el| 8 ebdb-format.el | 4 ++-- ebdb.el| 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ebdb-com.el b/ebdb-com.el index 8036e0f..d687978 100644 --- a/ebdb-com.el +++ b/ebdb-com.el @@ -532,13 +532,13 @@ This list is also used for toggling layouts." (field ebdb-field-phone) (_style (eql oneline)) (_record ebdb-record)) - (format "phone (%s)" (eieio-object-name-string field))) + (format "phone (%s)" (ebdb-field-label field))) (cl-defmethod ebdb-fmt-field-label ((_fmt ebdb-formatter-ebdb) (field ebdb-field-address) (_style (eql oneline)) (_record ebdb-record)) - (format "address (%s)" (eieio-object-name-string field))) + (format "address (%s)" (ebdb-field-label field))) (cl-defmethod ebdb-fmt-field :around ((_fmt ebdb-formatter-ebdb) (field ebdb-field) @@ -2969,8 +2969,8 @@ is a list, copy only the NUMth list element." (setq fields (seq-filter (lambda (f) -(string= (eieio-object-name-string f) - (eieio-object-name-string field))) +(string= (ebdb-field-label f) + (ebdb-field-label field))) fields))) (when (and num (> 1 (length fields))) (setq fields (list (nth num fields diff --git a/ebdb-format.el b/ebdb-format.el index d08fc6d..e1e8e21 100644 --- a/ebdb-format.el +++ b/ebdb-format.el @@ -207,7 +207,7 @@ FIELD-STRING1 FIELD-STRING2 ..)." (field ebdb-field-labeled) _style (_record ebdb-record)) - (eieio-object-name-string field)) + (ebdb-field-label field)) (cl-defmethod ebdb-fmt-field-label ((_fmt ebdb-formatter) (field ebdb-field-labeled) @@ -220,7 +220,7 @@ FIELD-STRING1 FIELD-STRING2 ..)." (_style (eql compact)) (record ebdb-record)) (format "(%s) %s" - (eieio-object-name-string field) + (ebdb-field-label field) (ebdb-fmt-field fmt field 'oneline record))) (cl-defmethod ebdb-fmt-field ((_fmt ebdb-formatter) diff --git a/ebdb.el b/ebdb.el index 5b8ade5..dcb6d26 100644 --- a/ebdb.el +++ b/ebdb.el @@ -1033,8 +1033,8 @@ process." (ebdb-add-to-list (symbol-value label-var) (slot-value field 'label)) (cl-call-next-method))) -(cl-defmethod eieio-object-name-string ((field ebdb-field-labeled)) - "Return a string which is FIELD's name." +(cl-defmethod ebdb-field-label ((field ebdb-field-labeled)) + "Return a string label for FIELD." (or (slot-value field 'label) (ebdb-field-readable-name (eieio-object-class field
[elpa] externals/ebdb 0eee3fa 2/4: Remove duplicate defvar
branch: externals/ebdb commit 0eee3faa1a89e1ca4a13297997a7c6cb922f3888 Author: Eric Abrahamsen Commit: Eric Abrahamsen Remove duplicate defvar * ebdb.el: `ebdb-i18n-countries-pref-scripts' was defvar'ed twice. --- ebdb.el | 1 - 1 file changed, 1 deletion(-) diff --git a/ebdb.el b/ebdb.el index fab25e1..5b8ade5 100644 --- a/ebdb.el +++ b/ebdb.el @@ -5002,7 +5002,6 @@ initialize those records." (thread-yield))) (or records ebdb-record-tracker -(defvar ebdb-i18n-countries-pref-scripts) ;;; Citing EBDB records
[elpa] externals/ebdb 2b27fcc 1/4: Be more careful about testing against user mail addresses
branch: externals/ebdb commit 2b27fcca0fd36e071aa4dfceae0aaeae9765e258 Author: Eric Abrahamsen Commit: Eric Abrahamsen Be more careful about testing against user mail addresses * ebdb-mua.el (ebdb-mua-test-headers): This can derail the whole process if works incorrectly (eg, user has no mail address), so put more thorough checks in place. --- ebdb-mua.el | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ebdb-mua.el b/ebdb-mua.el index f82d49e..0869919 100644 --- a/ebdb-mua.el +++ b/ebdb-mua.el @@ -227,7 +227,7 @@ accordingly." ((eq ebdb-user-mail-address-re 'self) (let ((self-rec (ebdb-record-self))) (unless self-rec -(user-error "`ebdb-user-mail-address-re' set to 'self, but `ebdb-record-self' is not set.? ")) +(user-error "`ebdb-user-mail-address-re' set to 'self, but `ebdb-record-self' is not set")) (setq ebdb-user-mail-address-re (regexp-opt (slot-value (ebdb-record-cache self-rec) @@ -598,13 +598,14 @@ HEADER-TYPE, as well as the IGNORE-ADDRESS argument, and the variables `ebdb-user-mail-address-re', `ebdb-accept-header-alist', and `ebdb-ignore-header-alist'." (let ((name (car address-parts)) - (mail (cadr address-parts))) + (mail (cadr address-parts)) + (user-mail (ebdb-get-user-mail-address-re))) (and (null (or (and (stringp ignore-address) (or (and name (string-match-p ignore-address name)) (and mail (string-match-p ignore-address mail - (string-match-p - (ebdb-get-user-mail-address-re) - mail))) + (and (stringp user-mail) + (null (string-empty-p user-mail)) + (string-match-p user-mail mail (cond ((null (or ebdb-accept-header-alist ebdb-ignore-header-alist)) t)
[elpa] externals/ebdb updated (dbc96c3 -> 9218d7c)
girzel pushed a change to branch externals/ebdb. from dbc96c3 Fix to "stop using eieio-named" new 2b27fcc Be more careful about testing against user mail addresses new 0eee3fa Remove duplicate defvar new a84affc Replace eieio-object-name-string with ebdb-field-label new 9218d7c Bump to 0.5.4 Summary of changes: ebdb-com.el| 8 ebdb-format.el | 4 ++-- ebdb-mua.el| 11 ++- ebdb.el| 7 +++ 4 files changed, 15 insertions(+), 15 deletions(-)
