[elpa] externals/lentic cf5f4a3b72 046/333: pabbrev handling was broken.

[ELPA Syncer]

branch: externals/lentic
commit cf5f4a3b725cc8ff1e591ef4541c86e480f437cf
Author: Phillip Lord <phillip.lord@newcastle.ac.uk>
Commit: Phillip Lord <phillip.lord@newcastle.ac.uk>

    pabbrev handling was broken.
    
    A function checking for pabbrev-expansion was returning
    nil when pabbrev was not loaded. This was causing very odd
    errors for me as I load pabbrev lazily. Now returns nil if
    pabbrev-expansion is not present.
---
 linked-buffer-block.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/linked-buffer-block.el b/linked-buffer-block.el
index d86705d7d1..61e530f812 100644
--- a/linked-buffer-block.el
+++ b/linked-buffer-block.el
@@ -161,11 +161,11 @@ implicit start and END an implicit stop."
   "Returns the length of any text that pabbrev has currently added to the 
buffer."
   ;; this *exact* form suppresses byte compiler warnings.
   ;; when or if and does not!
-  (if (boundp 'pabbrev-expansion)
-      (if pabbrev-expansion
-          ;; pabbrev sorts the expansion but also adds "[]" either side"
-          (+ 2 (length pabbrev-expansion))
-        0)))
+  (if (and (boundp 'pabbrev-expansion)
+           pabbrev-expansion)
+      ;; pabbrev sorts the expansion but also adds "[]" either side"
+      (+ 2 (length pabbrev-expansion))
+      0))
 
 (defmethod linked-buffer-convert ((conf linked-buffer-block-configuration)
                                   location)