*** hippie-exp.el	2017-06-26 12:50:18.923557011 +0200
--- hippie-exp-patched.el	2017-06-26 12:52:12.731563202 +0200
***************
*** 926,932 ****
  string).  It returns t if a new expansion is found, nil otherwise."
    (let ((expansion ())
  	(buf (current-buffer))
! 	(orig-case-fold-search case-fold-search))
      (if (not old)
  	(progn
  	  (he-init-string (he-dabbrev-beg) (point))
--- 926,934 ----
  string).  It returns t if a new expansion is found, nil otherwise."
    (let ((expansion ())
  	(buf (current-buffer))
! 	(orig-case-fold-search case-fold-search)
!     (heib hippie-expand-ignore-buffers)
!     (heob hippie-expand-only-buffers))
      (if (not old)
  	(progn
  	  (he-init-string (he-dabbrev-beg) (point))
***************
*** 941,949 ****
  			(< he-searched-n-bufs hippie-expand-max-buffers)))
  	  (set-buffer (car he-search-bufs))
  	  (if (and (not (eq (current-buffer) buf))
! 		   (if hippie-expand-only-buffers
! 		       (he-buffer-member hippie-expand-only-buffers)
! 		     (not (he-buffer-member hippie-expand-ignore-buffers))))
  	      (save-excursion
  		(save-restriction
  		  (if hippie-expand-no-restriction
--- 943,951 ----
  			(< he-searched-n-bufs hippie-expand-max-buffers)))
  	  (set-buffer (car he-search-bufs))
  	  (if (and (not (eq (current-buffer) buf))
! 		   (if heob
! 		       (he-buffer-member heob)
! 		     (not (he-buffer-member heib))))
  	      (save-excursion
  		(save-restriction
  		  (if hippie-expand-no-restriction