diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-18 09:04:57 +0800 |
| commit | 074c0268fd32d6527e124cff386bb6b15cf90017 (patch) | |
| tree | 62111c3c70d46a738f15514e988a707409ca45f4 /lisp/net | |
| parent | db48eff8cf4a88393c0209f663ca194ee37fa747 (diff) | |
| parent | 5ef169ed701fa4f850fdca5563cdd468207d5d4f (diff) | |
| download | emacs-feature/android.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/androidfeature/android
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/eudc-vars.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el index b3aa23f5827..b6b06f0c9fa 100644 --- a/lisp/net/eudc-vars.el +++ b/lisp/net/eudc-vars.el @@ -446,7 +446,7 @@ objectclass in Active Directory servers. You may not want functions like `eudc-query-form' and `eudc-expand-inline' to do LDAP wildcard expansion by default on certain fields. If so, add the relevant symbol to this list, for -example `samaccountname' for the \"E-Mail\" field." +example `mail' for the \"E-Mail\" field." :type '(repeat (symbol :tag "Directory attribute"))) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 3eb2dd13cbc..910d534330c 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5142,7 +5142,7 @@ support symbolic links." (defun tramp-handle-memory-info () "Like `memory-info' for Tramp files." - (let ((result '(0 0 0 0)) + (let ((result (list 0 0 0 0)) process-file-side-effects) (with-temp-buffer (cond |