HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes made in Gnus master
[bpt/emacs.git]
/
lisp
/
net
/
eudc.el
diff --git
a/lisp/net/eudc.el
b/lisp/net/eudc.el
index
4187614
..
ef09267
100644
(file)
--- a/
lisp/net/eudc.el
+++ b/
lisp/net/eudc.el
@@
-1,10
+1,9
@@
-;;; eudc.el --- Emacs Unified Directory Client
+;;; eudc.el --- Emacs Unified Directory Client
-*- coding: utf-8 -*-
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;; 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2013 Free Software Foundation, Inc.
;; Author: Oscar Figueiredo <oscar@cpe.fr>
;; Author: Oscar Figueiredo <oscar@cpe.fr>
-;; Maintainer: Pavel Jan
í
k <Pavel@Janik.cz>
+;; Maintainer: Pavel Jan
í
k <Pavel@Janik.cz>
;; Keywords: comm
;; This file is part of GNU Emacs.
;; Keywords: comm
;; This file is part of GNU Emacs.
@@
-49,9
+48,7
@@
(eval-and-compile
(if (not (fboundp 'make-overlay))
(eval-and-compile
(if (not (fboundp 'make-overlay))
- (require 'overlay))
- (if (not (fboundp 'unless))
- (require 'cl)))
+ (require 'overlay)))
(unless (fboundp 'custom-menu-create)
(autoload 'custom-menu-create "cus-edit"))
(unless (fboundp 'custom-menu-create)
(autoload 'custom-menu-create "cus-edit"))
@@
-134,7
+131,7
@@
(setq plist (cdr (cdr plist))))
nil))
(setq plist (cdr (cdr plist))))
nil))
-;; Emacs' plist-get lacks third parameter
+;; Emacs'
s
plist-get lacks third parameter
(defun eudc-plist-get (plist prop &optional default)
"Extract a value from a property list.
PLIST is a property list, which is a list of the form
(defun eudc-plist-get (plist prop &optional default)
"Extract a value from a property list.
PLIST is a property list, which is a list of the form
@@
-352,12
+349,12
@@
accordingly. Otherwise it is set to its EUDC default binding"
The translation is done according to
`eudc-protocol-attributes-translation-alist'."
(if eudc-protocol-attributes-translation-alist
The translation is done according to
`eudc-protocol-attributes-translation-alist'."
(if eudc-protocol-attributes-translation-alist
- (mapcar
'
(lambda (attribute)
- (let ((trans (assq (car attribute)
- (symbol-value eudc-protocol-attributes-translation-alist))))
- (if trans
- (cons (cdr trans) (cdr attribute))
- attribute)))
+ (mapcar (lambda (attribute)
+ (let ((trans (assq (car attribute)
+ (symbol-value eudc-protocol-attributes-translation-alist))))
+ (if trans
+ (cons (cdr trans) (cdr attribute))
+ attribute)))
query)
query))
query)
query))
@@
-367,7
+364,7
@@
The translation is done according to
`eudc-protocol-attributes-translation-alist'."
(if eudc-protocol-attributes-translation-alist
(let (trans)
`eudc-protocol-attributes-translation-alist'."
(if eudc-protocol-attributes-translation-alist
(let (trans)
- (mapcar
'
(lambda (attribute)
+ (mapcar (lambda (attribute)
(setq trans (assq attribute
(symbol-value eudc-protocol-attributes-translation-alist)))
(if trans
(setq trans (assq attribute
(symbol-value eudc-protocol-attributes-translation-alist)))
(if trans
@@
-693,7
+690,7
@@
server for future sessions."
(interactive (list
(read-from-minibuffer "Directory Server: ")
(intern (completing-read "Protocol: "
(interactive (list
(read-from-minibuffer "Directory Server: ")
(intern (completing-read "Protocol: "
- (mapcar
'
(lambda (elt)
+ (mapcar (lambda (elt)
(cons (symbol-name elt)
elt))
eudc-known-protocols)))))
(cons (symbol-name elt)
elt))
eudc-known-protocols)))))
@@
-797,7
+794,7
@@
If none try N - 1 and so forth."
(> n 0))
(setq formats
(delq nil
(> n 0))
(setq formats
(delq nil
- (mapcar
'
(lambda (format)
+ (mapcar (lambda (format)
(if (= n
(length format))
format
(if (= n
(length format))
format
@@
-830,10
+827,7
@@
see `eudc-inline-expansion-servers'"
(let* ((end (point))
(beg (save-excursion
(if (re-search-backward "\\([:,]\\|^\\)[ \t]*"
(let* ((end (point))
(beg (save-excursion
(if (re-search-backward "\\([:,]\\|^\\)[ \t]*"
- (save-excursion
- (beginning-of-line)
- (point))
- 'move)
+ (point-at-bol) 'move)
(goto-char (match-end 0)))
(point)))
(query-words (split-string (buffer-substring beg end) "[ \t]+"))
(goto-char (match-end 0)))
(point)))
(query-words (split-string (buffer-substring beg end) "[ \t]+"))
@@
-1217,7
+1211,7
@@
queries the server for the existing fields and displays a corresponding form."
;;; Load the options file
(if (and (not noninteractive)
(and (locate-library eudc-options-file)
;;; Load the options file
(if (and (not noninteractive)
(and (locate-library eudc-options-file)
- (progn (message "") t)) ; Remove modeline message
+ (progn (message "") t)) ; Remove mode
line message
(not (featurep 'eudc-options-file)))
(load eudc-options-file))
(not (featurep 'eudc-options-file)))
(load eudc-options-file))
@@
-1295,5
+1289,4
@@
This does nothing except loading eudc by autoload side-effect."
(provide 'eudc)
(provide 'eudc)
-;; arch-tag: e18872b6-db83-400b-869d-be54e9a4160c
;;; eudc.el ends here
;;; eudc.el ends here