-(defun company-dabbrev-code--symbols (regexp &optional limit)
- (let ((start (current-time))
- (symbols (company-dabbrev-code--buffer-symbols regexp (point))))
- (dolist (buffer (delq (current-buffer) (buffer-list)))
- (and (eq (buffer-local-value 'major-mode buffer) major-mode)
- (with-current-buffer buffer
- (setq symbols
- (company-dabbrev-code--buffer-symbols regexp nil symbols
- start limit))))
- (and limit
- (> (float-time (time-since start)) limit)
- (return)))
+(defun company-dabbrev-code--symbols (regexp)
+ (let* ((start (current-time))
+ (limit company-dabbrev-code-time-limit)
+ (symbols (company-dabbrev-code--buffer-symbols regexp (point) nil
+ start limit)))
+ (when company-dabbrev-code-other-buffers
+ (dolist (buffer (delq (current-buffer) (buffer-list)))
+ (and (eq (buffer-local-value 'major-mode buffer) major-mode)
+ (with-current-buffer buffer
+ (setq symbols
+ (company-dabbrev-code--buffer-symbols regexp nil symbols
+ start limit))))
+ (and limit
+ (> (float-time (time-since start)) limit)
+ (return))))