branch: externals/scanner
commit f7e66f39ad4037fd703955529c0dfe62a1159bf4
Merge: 37941bf3d8 43cf030c73
Author: Raffael Stocker <r.stoc...@mnet-mail.de>
Commit: Raffael Stocker <r.stoc...@mnet-mail.de>
Merge branch 'master' into develop/unpaper
---
scanner.el | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/scanner.el b/scanner.el
index f4c7eb4b30..e282ddf3f7 100644
--- a/scanner.el
+++ b/scanner.el
@@ -235,7 +235,7 @@ plugged in. For these, auto-detection will always be done."
(defcustom scanner-scan-delay
3
- "Delay between document scans in multi-page mode."
+ "Delay in seconds between document scans in multi-page mode."
:type '(number))
@@ -422,10 +422,10 @@ simply dropped."
("--mode" (concat
"--mode="
(plist-get scanner-scan-mode
scan-type)))
- ("--resolution"
(concat "--resolution="
-
(number-to-string
-
(plist-get scanner-resolution
-
scan-type))))
+ ("--resolution"
+ (concat
"--resolution="
+
(number-to-string
+
(plist-get scanner-resolution scan-type))))
((and "-x" (guard
size))
(list "-x"
(number-to-string (car size))))
((and "-y" (guard
size))
@@ -463,9 +463,7 @@ scanimage this will construct a shell command."
shell-command-switch
(concat scanner-scanimage-program
" "
- (mapconcat 'identity
- args
- " ")
+ (mapconcat 'identity args " ")
" > "
outfile))
`(,scanner-scanimage-program "-o" ,outfile ,@args)))
@@ -603,7 +601,8 @@ them. Otherwise, return nil."
(let ((configs (condition-case err
(directory-files
scanner-tesseract-configdir nil "[^.]")
(error
- (error "Could not find output
configurations %s" (cdr err))))))
+ (error "Could not find output
configurations %s"
+ (cdr err))))))
(list (completing-read-multiple "Outputs: " configs nil t))))
(setq scanner-tesseract-outputs outputs))
@@ -611,13 +610,15 @@ them. Otherwise, return nil."
(defun scanner-set-image-resolution (resolution)
"Set the RESOLUTION for scanning images."
(interactive "NImage scan resolution: ")
- (plist-put scanner-resolution :image resolution))
+ (setq scanner-resolution
+ (plist-put scanner-resolution :image resolution)))
;;;###autoload
(defun scanner-set-document-resolution (resolution)
"Set the RESOLUTION for scanning documents."
(interactive "NDocument scan resolution: ")
- (plist-put scanner-resolution :doc resolution))
+ (setq scanner-resolution
+ (plist-put scanner-resolution :doc resolution)))
;;;###autoload
(defun scanner-select-device (device)
